|
@@ -185,12 +185,13 @@ public class CwjsPolicyInfoController {
|
|
|
List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUserList = companyApprovalUserMapper.queryByUserId(userId);
|
|
|
List<CwjsPolicyInfo> cwjsPolicyInfoList = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
if(Check.isNull(cwjsPolicyInfoList)){
|
|
|
- return Result.successMsg("目前没有政策,请新增",null);
|
|
|
+ PageInfo<CwjsPolicyInfo> pageInfo = new PageInfo<>(cwjsPolicyInfoList);
|
|
|
+ return Result.successMsg("目前没有政策,请新增",pageInfo);
|
|
|
}
|
|
|
/**如果是管理员,就全部看,该搜索搜索,不搜索就全看*/
|
|
|
|
|
|
/**如果不是管理员,也不是审核人员。看自己和自己下属的所有政策。*/
|
|
|
- if(!"admin".equalsIgnoreCase(roleCode) && Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
+ if(!"admin".equalsIgnoreCase(roleCode) && !"finance".equalsIgnoreCase(roleCode) && Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
// Set<String> userIds= materialReportOverViewService.recursiveQuerySubordinate(userId);
|
|
|
List<String> userIds = cwjsPolicyInfoService.getAllSubordinate(userId);
|
|
|
List<CwjsPolicyInfo> removeList = new ArrayList<>();
|
|
@@ -202,7 +203,7 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicyInfoList.removeAll(removeList);
|
|
|
}
|
|
|
/**如果不是管理员,是审核人员。看自己创建的和自己下属的所有政策、和该自己审核。*/
|
|
|
- if(!"admin".equalsIgnoreCase(roleCode) && !Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
+ if(!"admin".equalsIgnoreCase(roleCode) && !"finance".equalsIgnoreCase(roleCode) && !Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
// Set<String> userIds= materialReportOverViewService.recursiveQuerySubordinate(userId);
|
|
|
List<String> userIds = cwjsPolicyInfoService.getAllSubordinate(userId);
|
|
|
|
|
@@ -226,7 +227,7 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
|
cwjsPolicy.setOperation("查看"); //所有人只要能看到就能有查看的按钮
|
|
|
if(userId.equals(cwjsPolicy.getCreateUserId()) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
|
- cwjsPolicy.setOperation("编辑|提交审核");
|
|
|
+ cwjsPolicy.setOperation("查看|编辑|提交审核");
|
|
|
}
|
|
|
|
|
|
if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
|
|
@@ -256,7 +257,7 @@ public class CwjsPolicyInfoController {
|
|
|
public Result getAllSaleList(@RequestParam(name="userId",required=true) String userId){
|
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
List<JSONObject> allSaleList;
|
|
|
- if("admin".equalsIgnoreCase(roleCode)){
|
|
|
+ if("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode)){
|
|
|
allSaleList = cwjsPolicyInfoService.getAllSale();
|
|
|
}else{
|
|
|
allSaleList = cwjsPolicyInfoService.getAllSaleByUserId(userId);
|
|
@@ -302,7 +303,7 @@ public class CwjsPolicyInfoController {
|
|
|
String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
|
Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
|
if(Check.isNull(companySubjectId)){
|
|
|
- return Result.errorMsg("您选择的区域和公司主体不合法,请联系开发人员");
|
|
|
+ return Result.errorMsg("您选择的区域和公司主体系统不支持,请联系开发人员开放");
|
|
|
}
|
|
|
cwjsPolicyInfo.setCompanySubjectId(companySubjectId);
|
|
|
List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUsers = companyApprovalUserMapper.queryByCompanySubjectId(companySubjectId);
|
|
@@ -354,6 +355,28 @@ public class CwjsPolicyInfoController {
|
|
|
if(cwjsPolicyInfoEntity==null) {
|
|
|
result.error500("未找到对应实体");
|
|
|
}else {
|
|
|
+ String companySubjectName = cwjsPolicyInfo.getCompanySubjectName();
|
|
|
+ String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
|
+ Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
|
+ if(Check.isNull(companySubjectId)){
|
|
|
+ return Result.errorMsg("您要修改的区域和公司主体系统不支持,请联系开发人员开放");
|
|
|
+ }
|
|
|
+ cwjsPolicyInfo.setCompanySubjectId(companySubjectId);
|
|
|
+ //删除旧的产品
|
|
|
+ cwjsPolicyProductService.deleteProductsByPolicyId(cwjsPolicyInfo.getId());
|
|
|
+ //保存新的产品
|
|
|
+ List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
|
+ JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
|
+ products.forEach(productName -> {
|
|
|
+ CwjsPolicyProduct policyProduct = new CwjsPolicyProduct();
|
|
|
+ policyProduct.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
+ policyProduct.setDelFlag(0);
|
|
|
+ policyProduct.setPolicyProductName((String) productName);
|
|
|
+ policyProduct.setPolicyId(cwjsPolicyInfo.getId());
|
|
|
+ policyProductList.add(policyProduct);
|
|
|
+ });
|
|
|
+ cwjsPolicyProductService.saveBatch(policyProductList);
|
|
|
+
|
|
|
boolean ok = cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
if(ok) {
|
|
|
result.success("修改成功!");
|
|
@@ -372,7 +395,7 @@ public class CwjsPolicyInfoController {
|
|
|
*/
|
|
|
@ApiOperation(value="政策信息表-通过id查询", notes="政策信息表-通过id查询")
|
|
|
@GetMapping(value = "/queryById")
|
|
|
- public Result<CwjsPolicyInfo> queryById(@RequestParam(name="id",required=true) String id) throws ParseException {
|
|
|
+ public Result<CwjsPolicyInfo> queryById(@RequestParam(name="id",required=true) Integer id) throws ParseException {
|
|
|
Result<CwjsPolicyInfo> result = new Result<>();
|
|
|
CwjsPolicyInfo cwjsPolicyInfo = cwjsPolicyInfoService.getById(id);
|
|
|
Date startDate = DateUtils.parseDate(cwjsPolicyInfo.getPolicyStartDate(),"yyyy-MM-dd");
|