Commit c2ccf87f authored by zhangyingbin's avatar zhangyingbin

修改ugp问题

parent 328c40d5
...@@ -9,7 +9,7 @@ import java.util.Map; ...@@ -9,7 +9,7 @@ import java.util.Map;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum ProblemTypeEnum { public enum ProblemTypeEnum {
一般问题("一般问题","1"), 一般问题("一般问题","3"),
重大问题("重大问题","2"), 重大问题("重大问题","2"),
存在问题("存在问题","0"), 存在问题("存在问题","0"),
不存在问题("不存在问题","1"); 不存在问题("不存在问题","1");
......
...@@ -113,6 +113,7 @@ public class CompanyController extends BaseController { ...@@ -113,6 +113,7 @@ public class CompanyController extends BaseController {
} }
model.setApproved(CompanyExamineEnum.企业审核.getNo()); model.setApproved(CompanyExamineEnum.企业审核.getNo());
model.setAdminLincensePic(JSON.toJSONString(adminLincensePic)); model.setAdminLincensePic(JSON.toJSONString(adminLincensePic));
model.setRecDate(new Date());
return ResponseHelper.buildResponse(companyServiceImpl.createWithModel(model)); return ResponseHelper.buildResponse(companyServiceImpl.createWithModel(model));
} }
......
...@@ -138,9 +138,11 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl ...@@ -138,9 +138,11 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
} }
LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
companyWrapper.in(Company::getRegionCode,regionCodes).eq(Company :: getApproved,CompanyExamineEnum.企业审核.getNo()); companyWrapper.in(Company::getRegionCode,regionCodes).eq(Company :: getApproved,CompanyExamineEnum.企业审核.getNo());
List<Company> companyList = companyService.list(companyWrapper); if(OrgEnum.监察部门.getKey().equals(companyType)||OrgEnum.监检机构.getKey().equals(companyType)){
for (Company company : companyList) { List<Company> companyList = companyService.list(companyWrapper);
taskDtoList.add(setTask(null, false, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr())); for (Company company : companyList) {
taskDtoList.add(setTask(null, false, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr()));
}
} }
return taskDtoList; return taskDtoList;
} }
...@@ -295,9 +297,11 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl ...@@ -295,9 +297,11 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
} }
LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
companyWrapper.in(Company::getRegionCode,regionCodes).eq(Company :: getApproved,CompanyExamineEnum.企业审核.getYes()); companyWrapper.in(Company::getRegionCode,regionCodes).eq(Company :: getApproved,CompanyExamineEnum.企业审核.getYes());
List<Company> companyList = companyService.list(companyWrapper); if(OrgEnum.监察部门.getKey().equals(companyType)||OrgEnum.监检机构.getKey().equals(companyType)) {
for (Company company : companyList) { List<Company> companyList = companyService.list(companyWrapper);
taskDtoList.add(setTask(null, true, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr())); for (Company company : companyList) {
taskDtoList.add(setTask(null, true, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr()));
}
} }
} }
return taskDtoList; return taskDtoList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment