调整履职计划查询

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/plan/CoreResumptionPlanPageDto.java

@@ -16,7 +16,11 @@ public class CoreResumptionPlanPageDto extends PageDto<ResumptionPlanPageVo> {
      * 计划名称
      */
     private String planName;
+    /**
+     * 计划类型 0：履职计划，1，安全检查，2教育培训
+     */
 
+    private Integer planType;
     /**
      * 计划状态
      */
@@ -31,6 +35,7 @@ public class CoreResumptionPlanPageDto extends PageDto<ResumptionPlanPageVo> {
      * 执行时刻
      */
     private Integer planExec;
+    private Integer resumptionRole;
 
     /**
      * 执行机构类型

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -72,6 +72,9 @@
             <if test="info.planName != '' and info.planName != null">
                 and a.plan_name LIKE CONCAT('%', #{info.planName}, '%' )
             </if>
+<!--            <if test="info.resumptionRole != '' and info.resumptionRole != null">-->
+<!--                and r.role_id =#{info.resumptionRole}-->
+<!--            </if>-->
             <if test="info.planStatus != null">
                 and a.plan_status = #{info.planStatus}
             </if>
@@ -84,6 +87,9 @@
             <if test="info.orgType != null">
                 and a.exec_org_type = #{info.orgType}
             </if>
+            <if test="info.planType != null">
+                and a.plan_type = #{info.planType}
+            </if>
             <if test="info.roleList != null and info.roleList.size > 0">
                 and a.id in (select plan_id from core_resumption_plan_to_role where role_id in
                 <foreach collection="info.roleList" item="roleId" index="index" open="(" separator="," close=")">
@@ -297,8 +303,7 @@
         select *
         from core_resumption_plan
         where plan_name like CONCAT('%', #{planName}, '%')
-          and deleted = 0
-        limit 1
+          and deleted = 0 limit 1
     </select>
     <select id="selectPlanNameById" resultType="java.lang.String">
         select plan_name