| | |
|---|
| | | import org.springframework.transaction.annotation.Transactional;
|
|---|
| | |
|
|---|
| | | import java.text.SimpleDateFormat;
|
|---|
| | | import java.time.LocalDateTime;
|
|---|
| | | import java.util.*;
|
|---|
| | |
|
|---|
| | | @Component
|
|---|
| | |
|---|
| | | CJRecordFromTask.setTaskId(task.getCheckId());
|
|---|
| | | //第二版标准新增
|
|---|
| | | CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
|
|---|
| | | List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(jobAndMeasureByJobId.getJobId());
|
|---|
| | | List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
|
|---|
| | | int typeTag = 0;
|
|---|
| | | for (PreventTaskType typeByJobId : typeByJobIds) {
|
|---|
| | | if (typeByJobId.getType()!= 0) {
|
|---|
| | |
|---|
| | |
|
|---|
| | | //通过用户名，获取涉及到的各位用户的真实姓名
|
|---|
| | | User createUser = new User();
|
|---|
| | | createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
|
|---|
| | | createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy()); //todo
|
|---|
| | | // createUser = trUserService.getUserByLoginName("guotai");
|
|---|
| | | if(ObjectUtils.isEmpty(createUser)){
|
|---|
| | | createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
|
|---|
| | | }
|
|---|
| | | User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
|
|---|
| | | User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy()); //todo
|
|---|
| | | // User updateUser = trUserService.getUserByLoginName("guotai");
|
|---|
| | | if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
|
|---|
| | | User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
|
|---|
| | | //登记人信息
|
|---|
| | |
|---|
| | | CJDangerInfo.setRiskMeasureId(null);//管控措施uuid
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | // if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
|
|---|
| | | // CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
|
|---|
| | | // }else {
|
|---|
| | | // CJDangerInfo.setDeleted("0");
|
|---|
| | | // }
|
|---|
| | | CJDangerInfo.setDeleted("0");
|
|---|
| | | CJDangerInfo.setId(dangerManage.getUuid());
|
|---|
| | | CJDangerInfo.setCompanyCode(companyCode);
|
|---|
| | |
|---|
| | | if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
|
|---|
| | | CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
|
|---|
| | | }
|
|---|
| | | if (hiddenDanger.getRectifyType().equals("1")){
|
|---|
| | | CJDangerInfo.setHazardDangerType("0");//隐患类型
|
|---|
| | | }else {
|
|---|
| | | CJDangerInfo.setHazardDangerType("1");//隐患类型
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | CJDangerInfo.setHazardDangerType(hiddenDanger.getHazardDangerType().toString());//隐患类型
|
|---|
| | | CJDangerInfo.setDangerManagerId(dangerManage.getId());
|
|---|
| | | //封装数据
|
|---|
| | | CJDangerInfoLists.add(CJDangerInfo);
|
|---|
