feature 代码提交

bs-common/src/main/java/com/rongwei/safecommon/config/BsMetaObjectHandler.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
@@ -59,6 +60,7 @@ public class BsMetaObjectHandler implements MetaObjectHandler {
 
             logger.info("start insert fill ....");
             Object tenantid = this.getFieldValByName("tenantid", metaObject);
+            logger.debug("开始获取最上层部门信息,当前操作用户为: {}", sysUser);
             if(null == tenantid && sysUser != null){
                 // 获取最上层部门
                 List<SysOrganizationVo> organizationDoList = sysUser.getOrganizationDoList();
@@ -75,6 +77,7 @@ public class BsMetaObjectHandler implements MetaObjectHandler {
                             }
                         }
                     }
+                    logger.debug("获取到的厂区", tid);
                     this.setFieldValByName("tenantid", tid, metaObject);
                 }
             }

cx_question/business-common/pom.xml

@@ -44,11 +44,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
-            <version>1.4</version>
-        </dependency>
 
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -142,6 +142,8 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
         aspCheckDiscoveryItemDos.forEach(info -> {
             HiddenDangerTrackDo hiddenDangerTrack = new HiddenDangerTrackDo();
             hiddenDangerTrack.setId(SecurityUtil.getUUID());
+            hiddenDangerTrack.setThemecheckid(themeCheck.getChecktemplateid());
+            hiddenDangerTrack.setThemecheckname(themeCheck.getChecktheme());
             //隐患来源 检查录入
             hiddenDangerTrack.setDangersource(MlConstants.DANGER_SOURCE_THEMECHECK);
             hiddenDangerTrack.setRelationid(checkItemDo.getId());
@@ -154,8 +156,7 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             sysSerialVo.setRuleTemplateStr("@{date:yyyyMMdd}@{serialNumber:#000000}");
             sysSerialVo.setModulecode("asp_hidden_danger_track_CODE");
             hiddenDangerTrack.setCode(sysSerialNumberService.getCodeByTemplate(sysSerialVo));
-            hiddenDangerTrack.setDangerworkpark(emptyStrReplace(info.getDeptid()));
-            hiddenDangerTrack.setDangerworkparkname(emptyStrReplace(info.getDept()));
+
             hiddenDangerTrack.setHiddendangertype(info.getType());
             hiddenDangerTrack.setHiddendangerclassify(info.getClassification());
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
@@ -171,8 +172,10 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             hiddenDangerTrack.setModifydate(new Date());
             hiddenDangerTrack.setThemecheckid(themeCheck.getChecktemplateid());
             hiddenDangerTrack.setThemecheckname(themeCheck.getChecktheme());
-            hiddenDangerTrack.setWorkshop(emptyStrReplace(info.getSection()));
-            hiddenDangerTrack.setWorkshopid(emptyStrReplace(info.getSectionid()));
+            hiddenDangerTrack.setWorkshop(emptyStrReplace(info.getDept()));
+            hiddenDangerTrack.setWorkshopid(emptyStrReplace(info.getDeptid()));
+            hiddenDangerTrack.setDangerworkpark(emptyStrReplace(info.getSectionid()));
+            hiddenDangerTrack.setDangerworkparkname(emptyStrReplace(info.getSection()));
             hiddenDangerTrack.setRectificationfund(info.getRectificationfund());
             hiddenDangerTrack.setMeasure(info.getMeasure());
             UserMailOrgVo userMailOrgVo = safetyPromoter.stream().filter(data -> data.getOrgId().equals(info.getDeptid())).findFirst().orElse(null);
@@ -186,7 +189,7 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             addList.add(hiddenDangerTrack);
         });
         hiddenDangerTrackService.saveBatch(addList);
-        checkItemDo.setSaved("2");
+        checkItemDo.setSaved("1");
         themeCheckItemService.saveOrUpdate(checkItemDo);
     }
 

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

@@ -161,7 +161,7 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
             logger.debug("无法通过ID 获取到检查计划");
             return;
         }
-        if (1 == themeCheckDo.getCreatetask()) {
+        if (themeCheckDo.getCreatetask() != null && themeCheckDo.getCreatetask() == 1) {
             logger.debug("此检查计划已生成检查任务");
             return;
         }