报修优化

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -251,13 +251,38 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         data.setSbName(sbInfo.getName());
         data.setSbNo(sbInfo.getPositionNo());
         data.setTrustDept(form.getTrustDept());
-        data.setPlanStartTime(DateUtils.dateToString(form.getPlanStartTime(),DateUtils.PATTERN_YMD_HMS));
-        data.setPlanEndTime(DateUtils.dateToString(form.getPlanEndTime(),DateUtils.PATTERN_YMD_HMS));
+        if(form.getPlanStartTime() != null){
+            data.setPlanStartTime(DateUtils.dateToString(form.getPlanStartTime(),DateUtils.PATTERN_YMD_HMS));
+        }
+        if(form.getPlanEndTime() != null){
+            data.setPlanEndTime(DateUtils.dateToString(form.getPlanEndTime(),DateUtils.PATTERN_YMD_HMS));
+        }
         data.setRepairFormType(form.getRepairFormType());
         info.setData(JsonUtils.objectToJson(data));
         customFieldTemplateDataMapper.updateByPrimaryKey(info);
     }
 
+    private void updateGenerateTicketDataForVerify(RepairApplicationForm form){
+        // 没有记录，增加记录值
+        CustomFieldTemplateData info = new CustomFieldTemplateData();
+        info.setObjId(form.getId());
+        info.setRemark(CommonConstants.REPAIR_TICKET_RECORD);
+        info = customFieldTemplateDataMapper.selectOne(info);
+        info.setUpdateTime(LocalDateTime.now());
+        // 修改值
+        RepairTicketTemplateData data = JsonUtils.jsonToModel(info.getData(),RepairTicketTemplateData.class);
+        data.setSbLocation(form.getSbCph());
+        // 维修专业
+        String[] arr1 = form.getRepairProfessor().split(",");
+        List<Integer> arrays1 = ListUtils.newArrayList();
+        for(String s : arr1){
+            arrays1.add(Integer.parseInt(s));
+        }
+        data.setRepairProfessor(arrays1);
+        info.setData(JsonUtils.objectToJson(data));
+        customFieldTemplateDataMapper.updateByPrimaryKey(info);
+    }
+
     private List<SysUserVO> getUserVOs(String user){
         String[] users = user.split(",");
         List<SysUserVO> vos = ListUtils.newArrayList();
@@ -851,7 +876,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 // 修改票证
                 queryForm.setRepairProfessor(model.getRepairProfessor());
                 queryForm.setSbCph(model.getSbCph());
-                updateGenerateTicketData(queryForm);
+                updateGenerateTicketDataForVerify(queryForm);
             }else if(model.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue()){
                 updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
             }else {