修改工作票

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java

@@ -446,7 +446,9 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
      * 工作接收人时间
      */
     @ApiModelProperty("工作接收人时间")
-    private String jobReceiverDateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime jobReceiverTime;
 
 
     /**

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -240,6 +240,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             }
             return;
         }
+        try {
             //更新工作票
             workTicket.setId(workTicketInfo.getId());
             //保存流程描述
@@ -249,6 +250,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             //工作流ID
             workTicket.setProcessInstanceId(response.getProcessInstanceId());
             workTicketInfoService.updateById(workTicket);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         //更新安全措施
         List<WorkTicketSafetyMeasureEntity> safetyMeasuresList = workTicketVo.getSafetyMeasuresList();
         if (CollectionUtils.isNotEmpty(safetyMeasuresList)) {
@@ -287,9 +291,11 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                 workTicketDelay.setCreateDept(workTicketInfo.getCreateDept());
                 workTicketDelay.setTicketId(workTicketInfo.getId());
                 workTicketDelay.setTenantId(workTicketInfo.getTenantId());
-                if (ObjectUtils.isEmpty(workTicketDelay.getId()) || ObjectUtils.isEmpty(workTicketDelayEntity)) {
+                if (ObjectUtils.isEmpty(workTicketDelayEntity)) {
+                    log.info("正在保存工作票延期");
                     workTicketDelayService.save(workTicketDelay);
                 } else {
+                    log.info("正在更新工作票延期");
                     workTicketDelayService.updateByTicketId(workTicketDelay);
                 }
             }
@@ -338,9 +344,11 @@ public class TicketProcessServiceImpl implements TicketProcessService {
 
                 WorkTicketPrincipalChangeEntity workTicketPrincipalChangeEntity = workTicketPrincipalChangeService.selectByTicketId(workTicket.getId());
 
-                if (workTicketPrincipalChange.getId() == null || ObjectUtils.isEmpty(workTicketPrincipalChangeEntity)) {
+                if (ObjectUtils.isEmpty(workTicketPrincipalChangeEntity)) {
+                    log.info("工作票负责人保存变更");
                     workTicketPrincipalChangeService.save(workTicketPrincipalChange);
                 } else {
+                    log.info("工作票负责人更新变更");
                     workTicketPrincipalChangeService.updateByTicketId(workTicketPrincipalChange);
                 }
                 log.info("工作负责人变更 原来的负责人 {}，变更为 {}", user.getName(), newUser.getName());
@@ -355,12 +363,16 @@ public class TicketProcessServiceImpl implements TicketProcessService {
 
 
         //工作票危险点分析及控制措施票
+        try {
             if (workTicketInfo.getIsHazard()) {
                 List<TicketInfoDanger> ticketInfoDangers = workTicketVo.getTicketInfoDangers();
                 if (CollectionUtils.isNotEmpty(ticketInfoDangers)) {
                     ticketInfoDangerService.saveBatch(ticketInfoDangers);
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -380,15 +392,21 @@ public class TicketProcessServiceImpl implements TicketProcessService {
 
         if ("0".equals(response.getHandleType())) {
             Long taskUser = NumberUtils.createLong(nextStepOperator.startsWith("taskUser_") ? nextStepOperator.substring(9) : null);
+            if (taskUser != null) {
                 //下一个审批人
                 User stepUser = UserCache.getUser(taskUser);
+                if (stepUser != null) {
                     flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(stepUser.getName()).concat("审批");
                     workTicket.setNextStepOperator(stepUser.getName());
                 }
+            }else {
+                workTicket.setNextStepOperator(null);
+            }
+        }
 
         if ("1".equals(response.getHandleType())) {
 
-            System.out.println("获取角色信息" + response.getNextStepOperator());
+            log.info("获取角色信息" + response.getNextStepOperator());
             //根据角色别名获取用户信息
             try {
                 R<List<User>> roleAlias = userClient.relationUserListByRoleAlias(workTicket.getTenantId(), workTicket.getCreateDept(), response.getNextStepOperator());
@@ -399,6 +417,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                 e.printStackTrace();
                 log.error("R<List<User>> roleAlias = userClient.userListByRoleAlias(workTicket.getTenantId(), response.getNextStepOperator())");
                 log.error("获取用户信息失败");
+                workTicket.setNextStepOperator(null);
             }
 
         }
@@ -418,6 +437,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
         if (StringUtils.isEmpty(nextStepOperator)) {
             workTicket.setNextStepOperator(null);
         }
+
+
+        System.out.println("workTicket = " + workTicket);
     }
 
 
@@ -599,6 +621,10 @@ public class TicketProcessServiceImpl implements TicketProcessService {
         workTicket.setStepOperator(UserCache.getUser(AuthUtil.getUserId()).getName());
         //唯一
         workTicket.setCreateUser(AuthUtil.getUserId());
+        workTicket.setIsSafety(false);
+        workTicket.setIsHazard(false);
+        workTicket.setIsRailway(false);
+        workTicket.setIsLimited(false);
         boolean isSave = firstWorkTicketService.save(workTicket);
         if (!isSave) {
             throw new IllegalArgumentException("保存工作对象错误");
@@ -738,13 +764,13 @@ public class TicketProcessServiceImpl implements TicketProcessService {
         //1. 工作对象
         Map<String, Object> workTicketInfoMap = PdfUtils.objectToMapResult(workTicket, result);
         //安全隔离措施附页 (true,展示附件,false,不展示附件
-        getDataConversion(workTicketInfoMap, "isSafety", workTicketInfoMap.get("isSafety"));
+        this.getDataConversion(workTicketInfoMap, "isSafety", workTicketInfoMap.get("isSafety"));
         //危险点分析与预控措施票 (true,展示附件,false,不展示附件)
-        getDataConversion(workTicketInfoMap, "isHazard", workTicketInfoMap.get("isHazard"));
+        this.getDataConversion(workTicketInfoMap, "isHazard", workTicketInfoMap.get("isHazard"));
         //危险点分析与预控措施票 (true,展示附件,false,不展示附件)
-        getDataConversion(workTicketInfoMap, "isRailway", workTicketInfoMap.get("isRailway"));
+        this.getDataConversion(workTicketInfoMap, "isRailway", workTicketInfoMap.get("isRailway"));
         //有限空间监测记录单(true,展示附件,false,不展示附件)
-        getDataConversion(workTicketInfoMap, "isLimited", workTicketInfoMap.get("isLimited"));
+        this.getDataConversion(workTicketInfoMap, "isLimited", workTicketInfoMap.get("isLimited"));
         result.putAll(workTicketInfoMap);
         //2. 安全措施
         List<WorkTicketSafetyMeasureEntity> safetyMeasuresList = workTicketVo.getSafetyMeasuresList();

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketPrincipalChangeServiceImpl.java

@@ -101,7 +101,7 @@ public class WorkTicketPrincipalChangeServiceImpl extends BaseServiceImpl<WorkTi
 		queryWrapper.eq(WorkTicketPrincipalChangeEntity::getTicketId,ticketId);
 		queryWrapper.orderByDesc(BaseEntity::getCreateTime);
 		queryWrapper.last("limit 1");
-		return  this.getOne(queryWrapper);
+		return  this.list(queryWrapper).get(0);
 	}
 
 	/**

hzims-service/ticket/src/main/resources/application.yml

@@ -5,6 +5,8 @@ mybatis-plus:
           - classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage:  com.hnac.hzims.**.entity
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 #swagger扫描路径配置
 swagger: