隐患修改，教育培训修改

danger-manage-system/src/main/java/com/zehong/system/domain/THiddenTroubleAssessment.java

@@ -20,6 +20,9 @@ public class THiddenTroubleAssessment extends BaseEntity
     /** $column.columnComment */
     private Long assessmentId;
 
+    private Long libraryId;
+
+    private Integer isXun;
     /** 排查任务id */
     @Excel(name = "排查任务id")
     private Long workId;
@@ -94,6 +97,59 @@ public class THiddenTroubleAssessment extends BaseEntity
 
     private Integer updateType = 0;
 
+    private String riskPoint;
+    private String inspectTerm;
+    private String inspectBasis;
+    private String libraryContent;
+
+    public Long getLibraryId() {
+        return libraryId;
+    }
+
+    public void setLibraryId(Long libraryId) {
+        this.libraryId = libraryId;
+    }
+
+    public Integer getIsXun() {
+        return isXun;
+    }
+
+    public void setIsXun(Integer isXun) {
+        this.isXun = isXun;
+    }
+
+    public String getRiskPoint() {
+        return riskPoint;
+    }
+
+    public void setRiskPoint(String riskPoint) {
+        this.riskPoint = riskPoint;
+    }
+
+    public String getInspectTerm() {
+        return inspectTerm;
+    }
+
+    public void setInspectTerm(String inspectTerm) {
+        this.inspectTerm = inspectTerm;
+    }
+
+    public String getInspectBasis() {
+        return inspectBasis;
+    }
+
+    public void setInspectBasis(String inspectBasis) {
+        this.inspectBasis = inspectBasis;
+    }
+
+    public String getLibraryContent() {
+        return libraryContent;
+    }
+
+    public void setLibraryContent(String libraryContent) {
+        this.libraryContent = libraryContent;
+    }
+
     public Integer getUpdateType() {
         return updateType;
     }

danger-manage-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleWorkServiceImpl.java

@@ -84,10 +84,10 @@ public class THiddenTroubleWorkServiceImpl implements ITHiddenTroubleWorkService
     {
         tHiddenTroubleWork.setCreateTime(DateUtils.getNowDate());
         int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(tHiddenTroubleWork);
-//        if(tHiddenTroubleWork.getWorkCycle()==1||tHiddenTroubleWork.getParentId()!=0L){
-//            String[] ids =  tHiddenTroubleWork.getContent().split(",");
-//            tHiddenTroubleAssessmentMapper.inserts(tHiddenTroubleWork.getWorkId(),ids);
-//        }
+        if(tHiddenTroubleWork.getWorkCycle()==1){
+            String[] ids =  tHiddenTroubleWork.getContent().split(",");
+            tHiddenTroubleAssessmentMapper.inserts(tHiddenTroubleWork.getWorkId(),ids);
+        }
         return a;
     }
 
@@ -205,26 +205,28 @@ public class THiddenTroubleWorkServiceImpl implements ITHiddenTroubleWorkService
         work.setWorkStep(0);
         work.setCreateTime(d);
         if(work.getBookId()!=null){
-            TStaningBook b = tStaningBookMapper.selectTStaningBookById(work.getBookId());
-            //如果隐患存在，并绑定的任务已完成则生成新新任务，否则不生成
-            if(b!=null&&b.getWorkId()!=null){
-                THiddenTroubleWork w = tHiddenTroubleWorkMapper.selectTHiddenTroubleWorkById(b.getWorkId());
-                if(w.getWorkStep()==4){
-                    int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
-                    b.setWorkId(work.getWorkId());
-                    tStaningBookMapper.updateTStaningBook(b);
-                }else{
-                    logger.info("===================任务进行中生成新排查任务失败");
-                }
-            }else {
-                int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
-                if(b!=null){
-                    b.setWorkId(work.getWorkId());
-                    tStaningBookMapper.updateTStaningBook(b);
-                }
-            }
+//            TStaningBook b = tStaningBookMapper.selectTStaningBookById(work.getBookId());
+//            //如果隐患存在，并绑定的任务已完成则生成新新任务，否则不生成
+//            if(b!=null&&b.getWorkId()!=null){
+//                THiddenTroubleWork w = tHiddenTroubleWorkMapper.selectTHiddenTroubleWorkById(b.getWorkId());
+//                if(w.getWorkStep()==4){
+//                    int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
+//                    b.setWorkId(work.getWorkId());
+//                    tStaningBookMapper.updateTStaningBook(b);
+//                }else{
+//                    logger.info("===================任务进行中生成新排查任务失败");
+//                }
+//            }else {
+//                int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
+//                if(b!=null){
+//                    b.setWorkId(work.getWorkId());
+//                    tStaningBookMapper.updateTStaningBook(b);
+//                }
+//            }
         }else {
             tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
+            String[] ids =  work.getContent().split(",");
+            tHiddenTroubleAssessmentMapper.inserts(work.getWorkId(),ids);
         }
     }
 }

danger-manage-system/src/main/resources/mapper/system/THiddenTroubleAssessmentMapper.xml

@@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="THiddenTroubleAssessment" id="THiddenTroubleAssessmentResult">
         <result property="assessmentId"    column="assessment_id"    />
+        <result property="libraryId"    column="library_id"    />
+        <result property="isXun"    column="is_xun"    />
         <result property="workId"    column="work_id"    />
         <result property="checkFeedback"    column="check_feedback"    />
         <result property="checkUrl"    column="check_url"    />
@@ -23,6 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="modifyBegin"    column="modify_begin"    />
         <result property="modifyEnd"    column="modify_end"    />
         <result property="modifyComplete"    column="modify_complete"    />
+        <result property="riskPoint"    column="risk_point"    />
+        <result property="inspectTerm"    column="inspect_term"    />
+        <result property="inspectBasis"    column="inspect_basis"    />
+        <result property="libraryContent"    column="library_content"    />
     </resultMap>
 
     <sql id="selectTHiddenTroubleAssessmentVo">
@@ -30,9 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTHiddenTroubleAssessmentList" parameterType="THiddenTroubleAssessment" resultMap="THiddenTroubleAssessmentResult">
-        <include refid="selectTHiddenTroubleAssessmentVo"/>
+        SELECT a.`assessment_id`,a.library_id,a.is_xun,a.check_url,a.check_time,a.check_user,a.check_feedback,
+        l.risk_point,l.inspect_term,l.inspect_basis,l.library_content
+        FROM t_hidden_trouble_assessment a  LEFT JOIN t_hidden_library l ON l.`library_id` = a.library_id
         <where>  
             <if test="assessmentLevel != null "> and assessment_level = #{assessmentLevel}</if>
+            <if test="workId != null "> and work_id = #{workId}</if>
         </where>
     </select>
     
@@ -124,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="inserts" >
         insert into t_hidden_trouble_assessment (library_id,work_id) VALUES
         <foreach collection="ids" item="item" index="index" separator=",">
-            (${item},workId)
+            (${item},#{workId})
         </foreach>
     </insert>
 </mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/THiddenTroubleWorkMapper.xml

@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="timeTerm != null">time_term,</if>
             <if test="workRange != null">work_range,</if>
             <if test="deptId != null">dept_id,</if>
+            <if test="staffId != null">staff_id,</if>
             <if test="workStep != null">work_step,</if>
             <if test="content != null">content,</if>
             <if test="createTime != null">create_time,</if>
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="timeTerm != null">#{timeTerm},</if>
             <if test="workRange != null">#{workRange},</if>
             <if test="deptId != null">#{deptId},</if>
+            <if test="staffId != null">#{staffId},</if>
             <if test="workStep != null">#{workStep},</if>
             <if test="content != null">#{content},</if>
             <if test="createTime != null">#{createTime},</if>

danger-manage-system/src/main/resources/mapper/system/TTrainPlanMapper.xml

@@ -84,8 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    LEFT JOIN t_train_plan_post pp ON ( p.`post_id` = pp.`post_id` AND pp.`plan_id` = #{planId} )
     </select>
     <select id="selectAlluserByplanId" resultType="java.lang.String">
-        SELECT user_id FROM sys_user_post
-        WHERE post_id IN (SELECT post_id FROM  t_train_plan_post  WHERE plan_id =#{planId})
-        GROUP BY user_id
+        SELECT post_id FROM  t_train_plan_post  WHERE plan_id =#{planId}
     </select>
 </mapper>
\ No newline at end of file