feature 增加代码

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -298,7 +298,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                         // 点检编号
 
                         String pointcheckcode = streamCodeGeneration("asp_point_check_POINTCHECKCODE",
-                                "@{date:yyyyMMdd}@{serialNumber:#0000000}","date:yyyyMMdd", checkTemplate.getTenantid());
+                                "@{date:yyyyMMdd}@{serialNumber:#0000000}","date:yyyy", checkTemplate.getTenantid());
                         // 点检生成
                         PointCheckDo pointCheckDo = new PointCheckDo();
                         pointCheckDo.setId(SecurityUtil.getUUID());

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/PointCheckServiceImpl.java

@@ -36,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
+import static com.rongwei.sfcommon.utils.CommonUtil.streamCodeGeneration;
+
 @Service("pointCheckService")
 public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheckDo> implements PointCheckService {
 
@@ -309,30 +311,31 @@ public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheck
                 }
                 hiddenDangerTrack.setHiddendangercontent(hiddendangercontent.toString());
                 // 任务工段
-                hiddenDangerTrack.setDangerworkpark(checkItemsDo.getChargeorgid());
-                hiddenDangerTrack.setDangerworkparkname(checkItemsDo.getChargeorgname());
+                hiddenDangerTrack.setDangerworkpark(pointCheck.getWorkshopid());
+                hiddenDangerTrack.setDangerworkparkname(pointCheck.getWorkshopname());
             }
             // 指派跟踪人取点检人的所属工段的工段主管
             if(StringUtils.isNotEmpty(pointCheck.getCheckuserid())){
                 List<Map<String,Object>> umap = pointCheckDao.getGdzgByUserId(pointCheck.getCheckuserid());
                 if(umap != null && umap.size()>0){
-                    hiddenDangerTrack.setTrackuserid(umap.get(0).get("USERID").toString());
-                    hiddenDangerTrack.setTrackusername(umap.get(0).get("USERNAME").toString());
+                    hiddenDangerTrack.setTrackuserid(umap.get(0).getOrDefault("USERID","").toString());
+                    hiddenDangerTrack.setTrackusername(umap.get(0).getOrDefault("USERNAME","").toString());
                     // 设置最初指派跟踪人
-                    hiddenDangerTrack.setFirsttrackuserid(umap.get(0).get("USERID").toString());
-                    hiddenDangerTrack.setFirsttrackusername(umap.get(0).get("USERNAME").toString());
+                    hiddenDangerTrack.setFirsttrackuserid(umap.get(0).getOrDefault("USERID","").toString());
+                    hiddenDangerTrack.setFirsttrackusername(umap.get(0).getOrDefault("USERNAME","").toString());
                 }
             }
             // 默认待关闭
             hiddenDangerTrack.setStatus(MlConstants.HIDDEN_DANGER_STATUS_NOTCLOSE);
+            hiddenDangerTrack.setSource("1");
             hiddenDangerTrack.setCheckphoto(pointCheck.getCheckphoto());
             // 隐患类型默认为一般
             hiddenDangerTrack.setHiddendangertype(MlConstants.HIDDEN_DANGER_TYPE_NORMAL);
-            // 总编号生成
-            SysSerialVo sysSerialVo = new SysSerialVo();
-            sysSerialVo.setRuleTemplateStr("@{date:yyyyMMdd}@{serialNumber:#000000}");
-            sysSerialVo.setModulecode("asp_hidden_danger_track_CODE");
-            hiddenDangerTrack.setCode(sysSerialNumberService.getCodeByTemplate(sysSerialVo));
+
+            String code = streamCodeGeneration("asp_hidden_danger_track_CODE",
+                    "@{date:yyyyMMdd}@{serialNumber:#000000}","date:yyyy", pointCheck.getTenantid());
+
+            hiddenDangerTrack.setCode(code);
             hiddenDangerTrackService.save(hiddenDangerTrack);
         }
     }

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/HiddenDangerTrackDo.java

@@ -178,4 +178,6 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
 	 */
 	private String shopfacilitatorid;
 
+	private String source;
+
 }