feat：监督模块分页条件2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1305,15 +1305,31 @@ public class WmSupervisionManager {
             isService = false;
 
             if (review) {
-                List<String> taskIds = list.stream().filter(ts -> StrUtil.equals(ts.getCreateBy(), user.getUsername())).map(ts -> ts.getTaskId().toString()).distinct().collect(Collectors.toList());
+
+                List<String> taskIds =
+                        list.stream()
+                                .filter(ts -> StrUtil.equals(ts.getCreateBy(), user.getUsername()))
+                                .map(ts -> ts.getTaskId().toString()).distinct().collect(Collectors.toList());
                 if (CollUtil.isEmpty(taskIds)) {
                     return page;
                 }
-                taskPage = taskService.page(new Page<>(query.getCurrent(), query.getSize()), Wrappers.<WmTask>lambdaQuery().in(WmTask::getId, taskIds));
+                taskPage = taskService.page(new Page<>(query.getCurrent(), query.getSize()),
+                        Wrappers.<WmTask>lambdaQuery()
+                                .in(CollUtil.isNotEmpty(userIds1), WmTask::getTaskUserId, userIds1)
+                                .eq(StrUtil.isNotBlank(query.getTaskTypeId()), WmTask::getTaskTypeId, query.getTaskTypeId())
+                                .like(StrUtil.isNotBlank(query.getTaskId()), WmTask::getId, query.getTaskId())
+                                .like(StrUtil.isNotBlank(query.getTaskNumber()), WmTask::getTaskNumber, query.getTaskNumber())
+                                .in(WmTask::getId, taskIds));
 
             } else {
                 List<Integer> supTaskIds = list.stream().mapToInt(WmTaskSupervision::getTaskId).boxed().sorted().distinct().collect(Collectors.toList());
-                taskPage = taskService.listAvailableTaskForSupervision2(new Page<>(query.getCurrent(), query.getSize()), pkgIds, supTaskIds);
+                taskPage = taskService.listAvailableTaskForSupervision3(
+                        new Page<>(query.getCurrent(), query.getSize()),
+                        userIds1,
+                        query.getTaskTypeId(),
+                        query.getTaskId(),
+                        query.getTaskNumber(),
+                        pkgIds, supTaskIds);
             }
         }
         // 服务商

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskMapper.java

@@ -216,5 +216,11 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
      */
     List<WmTask> listAvailableTaskForSupervision1(@Param(value = "pkgIds") Collection<Integer> pkgIds, @Param(value = "ignoreIds") Collection<Integer> ignoreIds);
 
-    Page<WmTask> listAvailableTaskForSupervision2(Page<WmTask> page, @Param(value = "pkgIds") Collection<Integer> pkgIds, @Param(value = "ignoreIds") Collection<Integer> ignoreIds);
+    Page<WmTask> listAvailableTaskForSupervision2(Page<WmTask> page,
+                                                  @Param(value = "pkgIds") Collection<Integer> pkgIds,
+                                                  @Param(value = "userIds") Collection<Integer> userIds,
+                                                  @Param(value = "taskTypeId") String taskTypeId,
+                                                  @Param(value = "taskId") String taskId,
+                                                  @Param(value = "taskNumber") String taskNumber,
+                                                  @Param(value = "ignoreIds") Collection<Integer> ignoreIds);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTaskService.java

@@ -241,4 +241,6 @@ public interface WmTaskService extends IService<WmTask> {
 
 
     List<WmTask> listPkgTasks(String pkgId);
+
+    Page<WmTask> listAvailableTaskForSupervision3(Page<WmTask> page, Collection<Integer> userIds1, String taskTypeId, String taskId, String taskNumber, Collection<Integer> pkgIds, Collection<Integer> ignoreIds);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2936,7 +2936,12 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 
     @Override
     public Page<WmTask> listAvailableTaskForSupervision2(Page<WmTask> page, Collection<Integer> pkgIds, Collection<Integer> ignoreIds) {
-        return this.baseMapper.listAvailableTaskForSupervision2(page, pkgIds, ignoreIds);
+        return this.baseMapper.listAvailableTaskForSupervision2(page, pkgIds, Collections.emptyList(), null, null, null, ignoreIds);
+    }
+
+    @Override
+    public Page<WmTask> listAvailableTaskForSupervision3(Page<WmTask> page, Collection<Integer> userIds1, String taskTypeId, String taskId, String taskNumber, Collection<Integer> pkgIds, Collection<Integer> ignoreIds) {
+        return baseMapper.listAvailableTaskForSupervision2(page, pkgIds, userIds1, taskTypeId, taskId, taskNumber, ignoreIds);
     }
 
     @Override

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -4,1430 +4,1447 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper">
 
-    <resultMap id="wmTaskMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTask">
-        <id property="id" column="id"/>
-        <result property="taskNumber" column="task_number"/>
-        <result property="taskTypeId" column="task_type_id"/>
-        <result property="taskRuleId" column="task_rule_id"/>
-        <result property="score" column="score"/>
-        <result property="scorePackageDrugId" column="score_package_drug_id"/>
-        <result property="scorePackageId" column="score_package_id"/>
-        <result property="scoreDrugId" column="score_drug_id"/>
-        <result property="lookintoDate" column="lookinto_date"/>
-        <result property="province" column="province"/>
-        <result property="city" column="city"/>
-        <result property="area" column="area"/>
-        <result property="address" column="address"/>
-        <result property="lookintoTypeId" column="lookinto_type_id"/>
-        <result property="taskContentId" column="task_content_id"/>
-        <result property="taskStatus" column="task_status"/>
-        <result property="submitStatus" column="submit_status"/>
-        <result property="taskUserId" column="task_user_id"/>
-        <result property="taskUserType" column="task_user_type"/>
-        <result property="drugEntId" column="drug_ent_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="enableFlag" column="enable_flag"/>
-        <result property="tenantId" column="tenant_id"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createUser" column="create_user"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateUser" column="update_user"/>
-        <result property="shareImgUrl" column="share_img_url"/>
-        <result property="platAuditStatus" column="plat_audit_status"/>
-        <result property="scorePackageLevel1Id" column="score_package_level1_id"/>
-        <result property="taskInfoImg" column="task_info_img"/>
-        <result property="compareResult" column="compare_result"/>
-        <result property="approvalOpinion" column="approval_opinion"/>
-        <result property="approvalInfo" column="approval_info"/>
-        <result property="realFlag" column="real_flag"/>
-        <result property="reportOneId" column="report_one_id"/>
-        <result property="reportOneApprovalStatus" column="report_one_approval_status"/>
-        <result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
-        <result property="reportOneApprovalInfo" column="report_one_approval_info"/>
-        <result property="reportSecondId" column="report_second_id"/>
-        <result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
-        <result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
-        <result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
-        <result property="reportDrugId" column="report_drug_id"/>
-        <result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
-        <result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
-        <result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
-        <result property="taskStatusInfo" column="task_status_info"/>
-        <result property="taskFrom" column="task_from"/>
-        <result property="reviewTaskCount" column="review_task_count"/>
-        <result property="deptReviewTaskCount" column="dept_review_task_count"/>
-        <result property="approvalUserId" column="approval_user_id"/>
-        <result property="approvalTime" column="approval_time"/>
-        <result property="deptApprovalUserId" column="dept_approval_user_id"/>
-        <result property="deptApprovalTime" column="dept_approval_time"/>
-
-    </resultMap>
-
-    <resultMap id="wmTaskWithContentMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTask">
-        <id property="id" column="id"/>
-        <result property="taskTypeId" column="task_type_id"/>
-        <result property="taskRuleId" column="task_rule_id"/>
-        <result property="score" column="score"/>
-        <result property="scorePackageDrugId" column="score_package_drug_id"/>
-        <result property="scorePackageId" column="score_package_id"/>
-        <result property="scoreDrugId" column="score_drug_id"/>
-        <result property="lookintoDate" column="lookinto_date"/>
-        <result property="province" column="province"/>
-        <result property="city" column="city"/>
-        <result property="area" column="area"/>
-        <result property="address" column="address"/>
-        <result property="lookintoTypeId" column="lookinto_type_id"/>
-        <result property="taskContentId" column="task_content_id"/>
-        <result property="taskStatus" column="task_status"/>
-        <result property="submitStatus" column="submit_status"/>
-        <result property="taskUserId" column="task_user_id"/>
-        <result property="taskUserType" column="task_user_type"/>
-        <result property="drugEntId" column="drug_ent_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="enableFlag" column="enable_flag"/>
-        <result property="tenantId" column="tenant_id"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createUser" column="create_user"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateUser" column="update_user"/>
-        <result property="shareImgUrl" column="share_img_url"/>
-        <result property="platAuditStatus" column="plat_audit_status"/>
-        <result property="scorePackageLevel1Id" column="score_package_level1_id"/>
-        <result property="taskInfoImg" column="task_info_img"/>
-        <result property="compareResult" column="compare_result"/>
-        <result property="approvalOpinion" column="approval_opinion"/>
-        <result property="approvalInfo" column="approval_info"/>
-        <result property="realFlag" column="real_flag"/>
-        <result property="reportOneId" column="report_one_id"/>
-        <result property="reportOneApprovalStatus" column="report_one_approval_status"/>
-        <result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
-        <result property="reportOneApprovalInfo" column="report_one_approval_info"/>
-        <result property="reportSecondId" column="report_second_id"/>
-        <result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
-        <result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
-        <result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
-        <result property="reportDrugId" column="report_drug_id"/>
-        <result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
-        <result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
-        <result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
-        <result property="taskStatusInfo" column="task_status_info"/>
-        <result property="taskFrom" column="task_from"/>
-        <association property="wmTaskContent" javaType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent">
-            <result property="temp1" column="temp1"/>
-            <result property="temp2" column="temp2"/>
-            <result property="temp3" column="temp3"/>
-            <result property="temp4" column="temp4"/>
-            <result property="temp5" column="temp5"/>
-            <result property="temp6" column="temp6"/>
-            <result property="temp7" column="temp7"/>
-            <result property="temp8" column="temp8"/>
-            <result property="temp9" column="temp9"/>
-            <result property="temp10" column="temp10"/>
-            <result property="temp11" column="temp11"/>
-            <result property="temp12" column="temp12"/>
-            <result property="temp13" column="temp13"/>
-            <result property="temp14" column="temp14"/>
-            <result property="temp15" column="temp15"/>
-            <result property="temp16" column="temp16"/>
-            <result property="temp17" column="temp17"/>
-            <result property="temp18" column="temp18"/>
-            <result property="temp19" column="temp19"/>
-            <result property="temp20" column="temp20"/>
-            <result property="temp21" column="temp21"/>
-            <result property="temp22" column="temp22"/>
-            <result property="temp23" column="temp23"/>
-            <result property="temp24" column="temp24"/>
-            <result property="temp25" column="temp25"/>
-            <result property="temp26" column="temp26"/>
-            <result property="temp28" column="temp28"/>
-            <result property="temp29" column="temp29"/>
-            <result property="temp30" column="temp30"/>
-            <result property="temp31" column="temp31"/>
-            <result property="temp32" column="temp32"/>
-        </association>
-    </resultMap>
-
-    <select id="selectListByExtEnt" resultMap="wmTaskMap">
-        SELECT
-        wm_task.*
-        FROM
-        wm_task,
-        wm_task_content
-        <where>
-            wm_task.task_content_id = wm_task_content.id
-            and wm_task.del_flag='0' and wm_task.enable_flag='0'
-
-
-            <if test="query.extIds != null and query.extIds.size()>0">
-                AND wm_task.task_content_id in (
-
-                <foreach collection="query.extIds" item="pid" index="index">
-                    select id from wm_task_content where wm_task_content.temp1 LIKE CONCAT('%',#{pid},'%')
-                    <if test="query.extIds.size()>1">
-                        <if test="query.extIds.size()>index-1">
-                            union
-                        </if>
-                    </if>
-                </foreach>
-
-                )
+  <resultMap id="wmTaskMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTask">
+    <id property="id" column="id"/>
+    <result property="taskNumber" column="task_number"/>
+    <result property="taskTypeId" column="task_type_id"/>
+    <result property="taskRuleId" column="task_rule_id"/>
+    <result property="score" column="score"/>
+    <result property="scorePackageDrugId" column="score_package_drug_id"/>
+    <result property="scorePackageId" column="score_package_id"/>
+    <result property="scoreDrugId" column="score_drug_id"/>
+    <result property="lookintoDate" column="lookinto_date"/>
+    <result property="province" column="province"/>
+    <result property="city" column="city"/>
+    <result property="area" column="area"/>
+    <result property="address" column="address"/>
+    <result property="lookintoTypeId" column="lookinto_type_id"/>
+    <result property="taskContentId" column="task_content_id"/>
+    <result property="taskStatus" column="task_status"/>
+    <result property="submitStatus" column="submit_status"/>
+    <result property="taskUserId" column="task_user_id"/>
+    <result property="taskUserType" column="task_user_type"/>
+    <result property="drugEntId" column="drug_ent_id"/>
+    <result property="deptId" column="dept_id"/>
+    <result property="delFlag" column="del_flag"/>
+    <result property="enableFlag" column="enable_flag"/>
+    <result property="tenantId" column="tenant_id"/>
+    <result property="createTime" column="create_time"/>
+    <result property="createUser" column="create_user"/>
+    <result property="updateTime" column="update_time"/>
+    <result property="updateUser" column="update_user"/>
+    <result property="shareImgUrl" column="share_img_url"/>
+    <result property="platAuditStatus" column="plat_audit_status"/>
+    <result property="scorePackageLevel1Id" column="score_package_level1_id"/>
+    <result property="taskInfoImg" column="task_info_img"/>
+    <result property="compareResult" column="compare_result"/>
+    <result property="approvalOpinion" column="approval_opinion"/>
+    <result property="approvalInfo" column="approval_info"/>
+    <result property="realFlag" column="real_flag"/>
+    <result property="reportOneId" column="report_one_id"/>
+    <result property="reportOneApprovalStatus" column="report_one_approval_status"/>
+    <result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
+    <result property="reportOneApprovalInfo" column="report_one_approval_info"/>
+    <result property="reportSecondId" column="report_second_id"/>
+    <result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
+    <result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
+    <result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
+    <result property="reportDrugId" column="report_drug_id"/>
+    <result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
+    <result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
+    <result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
+    <result property="taskStatusInfo" column="task_status_info"/>
+    <result property="taskFrom" column="task_from"/>
+    <result property="reviewTaskCount" column="review_task_count"/>
+    <result property="deptReviewTaskCount" column="dept_review_task_count"/>
+    <result property="approvalUserId" column="approval_user_id"/>
+    <result property="approvalTime" column="approval_time"/>
+    <result property="deptApprovalUserId" column="dept_approval_user_id"/>
+    <result property="deptApprovalTime" column="dept_approval_time"/>
+
+  </resultMap>
+
+  <resultMap id="wmTaskWithContentMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTask">
+    <id property="id" column="id"/>
+    <result property="taskTypeId" column="task_type_id"/>
+    <result property="taskRuleId" column="task_rule_id"/>
+    <result property="score" column="score"/>
+    <result property="scorePackageDrugId" column="score_package_drug_id"/>
+    <result property="scorePackageId" column="score_package_id"/>
+    <result property="scoreDrugId" column="score_drug_id"/>
+    <result property="lookintoDate" column="lookinto_date"/>
+    <result property="province" column="province"/>
+    <result property="city" column="city"/>
+    <result property="area" column="area"/>
+    <result property="address" column="address"/>
+    <result property="lookintoTypeId" column="lookinto_type_id"/>
+    <result property="taskContentId" column="task_content_id"/>
+    <result property="taskStatus" column="task_status"/>
+    <result property="submitStatus" column="submit_status"/>
+    <result property="taskUserId" column="task_user_id"/>
+    <result property="taskUserType" column="task_user_type"/>
+    <result property="drugEntId" column="drug_ent_id"/>
+    <result property="deptId" column="dept_id"/>
+    <result property="delFlag" column="del_flag"/>
+    <result property="enableFlag" column="enable_flag"/>
+    <result property="tenantId" column="tenant_id"/>
+    <result property="createTime" column="create_time"/>
+    <result property="createUser" column="create_user"/>
+    <result property="updateTime" column="update_time"/>
+    <result property="updateUser" column="update_user"/>
+    <result property="shareImgUrl" column="share_img_url"/>
+    <result property="platAuditStatus" column="plat_audit_status"/>
+    <result property="scorePackageLevel1Id" column="score_package_level1_id"/>
+    <result property="taskInfoImg" column="task_info_img"/>
+    <result property="compareResult" column="compare_result"/>
+    <result property="approvalOpinion" column="approval_opinion"/>
+    <result property="approvalInfo" column="approval_info"/>
+    <result property="realFlag" column="real_flag"/>
+    <result property="reportOneId" column="report_one_id"/>
+    <result property="reportOneApprovalStatus" column="report_one_approval_status"/>
+    <result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
+    <result property="reportOneApprovalInfo" column="report_one_approval_info"/>
+    <result property="reportSecondId" column="report_second_id"/>
+    <result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
+    <result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
+    <result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
+    <result property="reportDrugId" column="report_drug_id"/>
+    <result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
+    <result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
+    <result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
+    <result property="taskStatusInfo" column="task_status_info"/>
+    <result property="taskFrom" column="task_from"/>
+    <association property="wmTaskContent" javaType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent">
+      <result property="temp1" column="temp1"/>
+      <result property="temp2" column="temp2"/>
+      <result property="temp3" column="temp3"/>
+      <result property="temp4" column="temp4"/>
+      <result property="temp5" column="temp5"/>
+      <result property="temp6" column="temp6"/>
+      <result property="temp7" column="temp7"/>
+      <result property="temp8" column="temp8"/>
+      <result property="temp9" column="temp9"/>
+      <result property="temp10" column="temp10"/>
+      <result property="temp11" column="temp11"/>
+      <result property="temp12" column="temp12"/>
+      <result property="temp13" column="temp13"/>
+      <result property="temp14" column="temp14"/>
+      <result property="temp15" column="temp15"/>
+      <result property="temp16" column="temp16"/>
+      <result property="temp17" column="temp17"/>
+      <result property="temp18" column="temp18"/>
+      <result property="temp19" column="temp19"/>
+      <result property="temp20" column="temp20"/>
+      <result property="temp21" column="temp21"/>
+      <result property="temp22" column="temp22"/>
+      <result property="temp23" column="temp23"/>
+      <result property="temp24" column="temp24"/>
+      <result property="temp25" column="temp25"/>
+      <result property="temp26" column="temp26"/>
+      <result property="temp28" column="temp28"/>
+      <result property="temp29" column="temp29"/>
+      <result property="temp30" column="temp30"/>
+      <result property="temp31" column="temp31"/>
+      <result property="temp32" column="temp32"/>
+    </association>
+  </resultMap>
+
+  <select id="selectListByExtEnt" resultMap="wmTaskMap">
+    SELECT
+    wm_task.*
+    FROM
+    wm_task,
+    wm_task_content
+    <where>
+      wm_task.task_content_id = wm_task_content.id
+      and wm_task.del_flag='0' and wm_task.enable_flag='0'
+
+
+      <if test="query.extIds != null and query.extIds.size()>0">
+        AND wm_task.task_content_id in (
+
+        <foreach collection="query.extIds" item="pid" index="index">
+          select id from wm_task_content where wm_task_content.temp1 LIKE CONCAT('%',#{pid},'%')
+          <if test="query.extIds.size()>1">
+            <if test="query.extIds.size()>index-1">
+              union
             </if>
-
-            <if test="query.createTime != null and query.createTime != ''">
-                AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
-            </if>
-
-            <if test="query.updateTime != null and query.updateTime != ''">
-                AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
-            </if>
-
-            <if test="query.drugEntId != null and query.drugEntId != ''">
-                AND <![CDATA[ wm_task.drug_ent_id=#{query.drugEntId}]]>
-            </if>
-        </where>
-    </select>
-
-
-    <select id="selectListByExtEntNoPage" resultMap="wmTaskMap">
-        SELECT
-        wm_task.*
-        FROM
-        wm_task,
-        wm_task_content
-        <where>
-            wm_task.task_content_id = wm_task_content.id
-            and wm_task.del_flag='0' and wm_task.enable_flag='0'
-
-
-            <if test="query.extIds != null and query.extIds.size()>0">
-                AND wm_task.task_content_id in (
-
-                <foreach collection="query.extIds" item="pid" index="index">
-                    select id from wm_task_content where wm_task_content.temp1 LIKE CONCAT('%',#{pid},'%')
-                    <if test="query.extIds.size()>1">
-                        <if test="query.extIds.size()>index-1">
-                            union
-                        </if>
-                    </if>
-                </foreach>
-
-                )
-            </if>
-
-
-            <if test="query.createTime != null and query.createTime != ''">
-                AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
-            </if>
-
-            <if test="query.updateTime != null and query.updateTime != ''">
-                AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
-            </if>
-
-            <if test="query.drugEntId != null and query.drugEntId != ''">
-                AND <![CDATA[ wm_task.drug_ent_id<=#{query.drugEntId}]]>
-            </if>
-        </where>
-    </select>
-
-
-    <select id="getTaskListByPackageIds" resultType="java.util.HashMap">
-        select * from (SELECT
-        package_id,
-        score_name,
-        base_id,
-        sum(score) score,
-        count(1) score_count,
-        realname,
-        dept_name,
-        DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        group by
-        package_id,
-        score_name,
-        base_id,
-        realname,
-        dept_name
-        ) a ORDER BY a.dept_name,a.score_name,a.realname
-    </select>
-
-    <select id="getTaskListByPackageIdsAndUser" resultType="java.util.HashMap">
-        SELECT
-        *
-        FROM
-        (
-        SELECT
-        score_name,
-        sum( score ) score,
-        count( 1 ) score_count,
-        realname,
-        dept_name
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
+          </if>
         </foreach>
-        )
-        GROUP BY
-        score_name,
-        dept_name,
-        realname
-        ) A
-        ORDER BY
-        A.dept_name,
-        a.score_name,
-        a.realname
-    </select>
-
-
-    <select id="getTaskListByPackageIdsCount" resultType="java.util.HashMap">
-        SELECT
-        base_id taskTypeName,
-        sum( score ) taskSum,
-        count( 1 ) taskCount
-        FROM
-        wm_zb_count
-        WHERE
-        package_id IN (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
 
-        GROUP BY
-        base_id
-    </select>
-
-    <select id="getTaskListByPackageIdsZd" resultType="java.util.HashMap">
-        SELECT
-        DATE_FORMAT(min( create_time ),'%Y-%m-%d') mindate,
-        DATE_FORMAT(max( create_time ),'%Y-%m-%d') maxdate,
-        GROUP_CONCAT( DISTINCT realname ) realname,
-        sum( score ) sumscore,
-        GROUP_CONCAT( DISTINCT task_rule_id ) task_rule_id
-        FROM
-        wm_zb_count
-        where package_id IN (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        or
-        package_id IN (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
         )
-    </select>
-
-
-    <select id="getTaskListByPackageIdsReturnWmtaskInfo" resultMap="wmTaskMap">
-        SELECT
-        *
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
+      </if>
+
+      <if test="query.createTime != null and query.createTime != ''">
+        AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
+      </if>
+
+      <if test="query.updateTime != null and query.updateTime != ''">
+        AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
+      </if>
+
+      <if test="query.drugEntId != null and query.drugEntId != ''">
+        AND <![CDATA[ wm_task.drug_ent_id=#{query.drugEntId}]]>
+      </if>
+    </where>
+  </select>
+
+
+  <select id="selectListByExtEntNoPage" resultMap="wmTaskMap">
+    SELECT
+    wm_task.*
+    FROM
+    wm_task,
+    wm_task_content
+    <where>
+      wm_task.task_content_id = wm_task_content.id
+      and wm_task.del_flag='0' and wm_task.enable_flag='0'
+
+
+      <if test="query.extIds != null and query.extIds.size()>0">
+        AND wm_task.task_content_id in (
+
+        <foreach collection="query.extIds" item="pid" index="index">
+          select id from wm_task_content where wm_task_content.temp1 LIKE CONCAT('%',#{pid},'%')
+          <if test="query.extIds.size()>1">
+            <if test="query.extIds.size()>index-1">
+              union
+            </if>
+          </if>
         </foreach>
-        )
 
-        order by task_user_id asc,create_time asc
-
-    </select>
-
-    <select id="selectZbCount" resultType="java.util.HashMap">
-        select * from (select * from (SELECT
-        package_id,
-        score_name,
-        send_package_dept_id,
-        dept_id,
-        sum(score) score,
-        count(1) score_count,
-        realname,
-        dept_name,
-        DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
-        DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        group by
-        package_id,
-        score_name,
-        send_package_dept_id,
-        dept_id,
-        package_score,
-        realname,
-        dept_name
-        ) a ORDER BY a.dept_name,a.score_name,a.realname ) b
-    </select>
-
-    <select id="selectByWmTaskOne" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_one_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-    </select>
-    <select id="selectByWmTaskSecond" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_second_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-    </select>
-    <select id="selectByWmTaskDrug" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_drug_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
         )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-    </select>
-
-    <select id="selectByWmTaskId" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
-          AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
-          AND del_flag = 0
-          AND enable_flag = 0
-    </select>
-
-    <select id="selectByReportOneApprovalStatus" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_one_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-        and
-        report_one_approval_status = #{query.reportOneApprovalStatus,jdbcType=VARCHAR}
-        group by dept_id, report_one_approval_status, score_package_id
-    </select>
-
-    <select id="selectByReportSecondApprovalStatus" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_second_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-        and
-        report_second_approval_status = #{query.reportSecondApprovalStatus,jdbcType=VARCHAR}
-        group by dept_id, report_second_approval_status, score_package_id
-    </select>
-
-    <select id="selectByReportDrugApprovalStatus" resultType="java.util.HashMap">
-        select
-        sum(score) score,
-        count(1) score_count,
-        dept_id,
-        report_drug_approval_status,
-        score_package_id
-        from wm_task
-        where score_package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and
-        task_status = #{query.taskStatus,jdbcType=VARCHAR}
-        and
-        report_drug_approval_status = #{query.reportDrugApprovalStatus,jdbcType=VARCHAR}
-        group by dept_id, report_drug_approval_status, score_package_id
-    </select>
-    <select id="selectById" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE id = #{query.Id,jdbcType=BIGINT}
-    </select>
-
-    <select id="selectByRealFlag" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE id = #{Id,jdbcType=BIGINT}
-          AND real_flag = 0
-    </select>
-
-    <select id="selectWmTaskById" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE id = #{query.id,jdbcType=BIGINT}
-          AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
-    </select>
-    <select id="selectListByIds" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
-          AND real_flag = 0
-    </select>
-    <select id="selectListByScorePackageId" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
-          AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
-          AND del_flag = 0
-          AND enable_flag = 0
-    </select>
-    <select id="getTaskListByPackageIdsForJs" resultType="java.util.HashMap">
-        select * from (select * from (SELECT
-        package_id,
-        score_name,
-        package_score,
-        sum(score) score,
-        count(1) score_count,
-        realname,
-        dept_name,
-        DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
-        DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        group by
-        package_id,
-        score_name,
-        package_score,
-        realname,
-        dept_name
-        ) a ORDER BY a.dept_name,a.score_name,a.realname ) b
-
-        union
-
-        SELECT
-        "" package_id,
-        "" score_name,
-        package_score,
-        sum(score) score,
-        count(1) score_count,
-        "合计" realname,
-        "" dept_name,
-        "" create_time,
-        "" pcreate_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-    </select>
-
-    <select id="getTaskListByPackageIdsForJsUser" resultType="java.util.HashMap">
-        select * from (SELECT
-        *
-        FROM
-        (
-        SELECT
-        sum( score ) score,
-        count( 1 ) score_count,
-        user_id,
-        realname,
-        phone,
-        dept_name,
-        DATE_FORMAT( max( create_time ), '%Y-%m-%d' ) create_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        GROUP BY
-        user_id,
-        realname,
-        phone,
-        dept_name
-        ) a
-        ORDER BY
-        a.dept_name,
-        a.realname) bb
-        UNION
-        SELECT
-        sum( score ) score,
-        count( 1 ) score_count,
-        "" user_id,
-        "合计" realname,
-        "" phone,
-        ""dept_name,
-        "" create_time
-        FROM
-        wm_zb_count
-        where package_id in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-    </select>
-
-
-    <select id="getH5PackageList" resultType="java.util.HashMap">
-        SELECT
-        p.id id ,
-        p.score_package_name as score_name,u.realname,
-        p.package_type1 as type1,
-        u.phone,
-        u.user_id as userId,
-        sum( ifnull(t.score, 0) ) taskSum,
-        count( 1 ) taskCount
-        FROM
-        wm_task t
-        left join wm_score_package p on p.id=t.score_package_id
-        left join sys_user u on u.user_id=t.task_user_id
-        where p.score_package_name in (
-        <foreach collection="query.extIds" item="pid" index="index" separator=",">
-            #{pid}
-        </foreach>
-        )
-        and t.task_status=3
-        and t.del_flag=0
-        and t.enable_flag=0
-        GROUP BY
-        p.id,p.score_package_name,u.realname,u.phone
-    </select>
-
-
-    <select id="getH5TaskList" resultType="java.util.HashMap">
-        SELECT t.id                                   id,
-               p.score_package_name AS                score_name,
-               p.package_type2      AS                `type`,
-               p.package_type1      AS                type1,
-               u.realname,
-               e.task_type_name,
-               DATE_FORMAT(t.create_time, '%Y-%m-%d') create_time,
-               IFNULL(t.score, 0)                     taskSum,
-               IFNULL(t.score, 0)                     taskCount
-        FROM wm_task t
-                 LEFT JOIN wm_score_package p ON p.id = t.score_package_id
-                 LEFT JOIN sys_user u ON u.user_id = t.task_user_id
-                 LEFT JOIN wm_task_type e ON e.id = t.task_type_id
-        WHERE p.id = #{query.scorePackageId}
-          AND t.task_status = 3
-          AND t.task_user_id = #{query.taskUserId}
-          AND t.del_flag = 0
-          AND t.enable_flag = 0
-        ORDER BY t.create_time DESC
-
-    </select>
-
-
-    <select id="getTaskListByIds" resultType="java.util.HashMap">
-        select * from (
-        SELECT
-        p.id AS package_id,
-        p.score_package_name AS score_name,
-        c.realname AS realname,
-        d.name AS dept_name,
-        m.label AS base_id,
-        sum(t.score) score,
-        count(1) score_count,
-        DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_id = p.id
-        JOIN wm_task_type b
-        left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
-        JOIN sys_user c
-        JOIN sys_dept d
-        WHERE b.id = t.task_type_id
-        AND c.user_id = t.task_user_id
-        AND c.dept_id = d.dept_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        and t.real_flag = '0'
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        group by
-        p.id,
-        p.score_package_name,
-        m.label,
-        c.realname,
-        d.name
-        )a ORDER BY a.dept_name,a.score_name,a.realname
-    </select>
-
-    <select id="getTaskListByIdsOld" resultType="java.util.HashMap">
-        select * from (
-        SELECT
-        p.id AS package_id,
-        p.score_package_name AS score_name,
-        c.realname AS realname,
-        d.name AS dept_name,
-        m.label AS base_id,
-        sum(t.score) score,
-        count(1) score_count,
-        DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_drug_id = p.id
-        JOIN wm_task_type b
-        left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
-        JOIN sys_user c
-        JOIN sys_dept d
-        WHERE b.id = t.task_type_id
-        AND c.user_id = t.task_user_id
-        AND c.dept_id = d.dept_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        and t.real_flag = '0'
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        group by
-        p.id,
-        p.score_package_name,
-        m.label,
-        c.realname,
-        d.name
-        )a ORDER BY a.dept_name,a.score_name,a.realname
-    </select>
-
-    <select id="getTaskListByIdsJs" resultType="java.util.HashMap">
-        select * from (
-        SELECT
-        p.id AS package_id,
-        p.score_package_name AS score_name,
-        c.realname AS realname,
-        d.name AS dept_name,
-        m.label AS base_id,
-        sum(t.score) score,
-        count(1) score_count,
-        DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_id = p.id
-        JOIN wm_task_type b
-        left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
-        JOIN sys_user c
-        JOIN sys_dept d
-        WHERE b.id = t.task_type_id
-        AND c.user_id = t.task_user_id
-        and d.dept_id=t.dept_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        and p.package_type2=2
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        group by
-        p.id,
-        p.score_package_name,
-        m.label,
-        c.realname,
-        d.name
-        )a ORDER BY a.dept_name,a.score_name,a.realname
-    </select>
-
-
-    <select id="getTaskListByIdsReturnWmtaskInfo" resultMap="wmTaskMap">
-        SELECT
-        t.id AS id,
-        t.task_rule_id AS task_rule_id,
-        t.score AS score,
-        t.score_package_drug_id AS score_package_drug_id,
-        t.score_package_level1_id AS score_package_level1_id,
-        t.score_package_id AS score_package_id,
-        t.task_type_id AS task_type_id,
-        t.lookinto_date AS lookinto_date,
-        t.province AS province,
-        t.city AS city,
-        t.area AS area,
-        t.address AS address,
-        t.lookinto_type_id AS lookinto_type_id,
-        t.task_content_id AS task_content_id,
-        t.task_status AS task_status,
-        t.task_user_id AS task_user_id,
-        t.task_user_type AS task_user_type,
-        t.drug_ent_id AS drug_ent_id,
-        t.dept_id AS dept_id,
-        t.del_flag AS del_flag,
-        t.enable_flag AS enable_flag,
-        t.tenant_id AS tenant_id,
-        t.lookinto_date AS create_time,
-        t.create_user AS create_user,
-        t.update_time AS update_time,
-        t.update_user AS update_user,
-        t.submit_status AS submit_status,
-        t.share_img_url AS share_img_url,
-        t.plat_audit_status AS plat_audit_status,
-        t.ext_ids AS ext_ids,
-        t.task_info_img AS task_info_img
-        FROM wm_task t
-        where 1=1
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        order by t.task_user_id asc,t.create_time asc
-    </select>
-
-    <select id="getTaskListByIdsCount" resultType="java.util.HashMap">
-        SELECT
-        m.label AS taskTypeName,
-        sum( t.score ) taskSum,
-        count( 1 ) taskCount
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_id = p.id
-        JOIN wm_task_type b
-        left join sys_dict_item m on m.type='score_task_type' and m.`value`=b.parent_id
-        WHERE b.id = t.task_type_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        GROUP BY
-        m.label
-    </select>
-
-    <select id="getTaskListByIdsZd" resultType="java.util.HashMap">
-        SELECT
-        DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
-        DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
-        GROUP_CONCAT( DISTINCT c.realname ) realname,
-        sum( t.score ) sumscore,
-        GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_id = p.id
-        JOIN wm_task_type b
-        JOIN sys_user c
-        JOIN sys_dept d
-        WHERE b.id = t.task_type_id
-        AND c.user_id = t.task_user_id
-        AND c.dept_id = d.dept_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        ORDER BY
-        t.task_rule_id,
-        t.task_user_id,
-        t.lookinto_date
-
-    </select>
-
-    <select id="getTaskListByIdsZdJs" resultType="java.util.HashMap">
-        SELECT
-        DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
-        DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
-        GROUP_CONCAT( DISTINCT c.realname ) realname,
-        sum( t.score ) sumscore,
-        GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
-        FROM wm_task t
-        LEFT JOIN wm_score_package p ON t.score_package_id = p.id
-        JOIN wm_task_type b
-        JOIN sys_user c
-        JOIN sys_dept d
-        WHERE b.id = t.task_type_id
-        AND c.user_id = t.task_user_id
-        AND t.dept_id = d.dept_id
-        and t.task_status=3
-        and t.enable_flag=0
-        and t.del_flag=0
-        and p.package_type2=2
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-        ORDER BY
-        t.task_rule_id,
-        t.task_user_id,
-        t.lookinto_date
-
-    </select>
-
-    <select id="getWmTaskList" resultMap="wmTaskMap">
-        SELECT
-        t.id AS id,
-        t.task_number,
-        t.task_rule_id AS task_rule_id,
-        t.score AS score,
-        p2.id AS score_package_drug_id,
-        p1.id AS score_package_level1_id,
-        p.score_package_name,
-        p.score_package_name AS score_package_id,
-        t.task_type_id AS task_type_id,
-        t.lookinto_date AS lookinto_date,
-        t.real_flag AS realFlag,
-        t.province AS province,
-        t.city AS city,
-        t.area AS area,
-        t.address AS address,
-        t.lookinto_type_id AS lookinto_type_id,
-        t.task_content_id AS task_content_id,
-        t.task_status AS task_status,
-        u.realname AS task_user_id,
-        t.task_user_type AS task_user_type,
-        t.drug_ent_id AS drug_ent_id,
-        d.`name` AS dept_id,
-        t.del_flag AS del_flag,
-        t.enable_flag AS enable_flag,
-        t.tenant_id AS tenant_id,
-        t.lookinto_date AS create_time,
-        t.create_user AS create_user,
-        t.update_time AS update_time,
-        t.update_user AS update_user,
-        t.submit_status AS submit_status,
-        t.share_img_url AS share_img_url,
-        t.plat_audit_status AS plat_audit_status,
-        t.task_info_img AS task_info_img,
-        t.review_task_count,
-        t.report_drug_id,
-        t.report_one_id,
-        t.report_second_id,
-        t.task_status_info,
-        t.approval_user_id,
-        t.approval_time,
-        t.dept_approval_user_id,
-        t.dept_approval_time
-        FROM wm_task t
-        left join sys_user u on u.user_id=t.task_user_id
-        left join sys_dept d on d.dept_id=t.dept_id
-        left join wm_score_package p on p.id=t.score_package_id
-        left join wm_score_package p1 on p1.id=t.score_package_level1_id
-        left join wm_score_package p2 on p1.id=t.score_package_drug_id
-        where t.del_flag=0
-        and t.real_flag=0
-        and t.task_status !='1'
-        <if test="query.scorePackageDrugId!=null and query.scorePackageDrugId!=''">
-            and t.score_package_drug_id = #{query.scorePackageDrugId}
-        </if>
-        <if test="query.scorePackageLevel1Id!=null and query.scorePackageLevel1Id!=''">
-            and t.score_package_level1_id = #{query.scorePackageLevel1Id}
-        </if>
-        <if test="query.scorePackageId!=null and query.scorePackageId!=''">
-            and t.score_package_id = #{query.scorePackageId}
-        </if>
-        <if test="query.id!=null and query.id!=''">
-            and t.id = #{query.id}
-        </if>
-        <if test="query.taskStatus!=null and query.taskStatus!=''">
-            and t.task_status = #{query.taskStatus}
-        </if>
-        <if test="query.taskUserId!=null and query.taskUserId!=''">
-            and t.task_user_id = #{query.taskUserId}
-        </if>
-        <if test="query.taskNumber != null and query.taskNumber != ''">
-            and t.task_number like concat('%', #{query.taskNumber}, '%')
-        </if>
-        <if test="query.taskTypeId != null and query.taskTypeId != ''">
-            and t.task_type_id = #{query.taskTypeId}
-        </if>
-        order by t.lookinto_date
-
-    </select>
-
-    <!-- 根据配置查询任务 -->
-    <select id="listWmTaskByConfig" resultMap="wmTaskMap">
-        SELECT
-        t.id AS id,
-        t.task_rule_id AS task_rule_id,
-        t.score AS score,
-        p.score_package_name AS score_package_id,
-        t.task_type_id AS task_type_id,
-        t.lookinto_date AS lookinto_date,
-        t.province AS province,
-        t.city AS city,
-        t.area AS area,
-        t.address AS address,
-        t.lookinto_type_id AS lookinto_type_id,
-        t.task_content_id AS task_content_id,
-        t.task_status AS task_status,
-        u.realname AS task_user_id,
-        t.task_user_type AS task_user_type,
-        t.drug_ent_id AS drug_ent_id,
-        d.`name` AS dept_id,
-        t.del_flag AS del_flag,
-        t.enable_flag AS enable_flag,
-        t.tenant_id AS tenant_id,
-        t.lookinto_date AS create_time,
-        t.create_user AS create_user,
-        t.update_time AS update_time,
-        t.update_user AS update_user,
-        t.submit_status AS submit_status,
-        t.share_img_url AS share_img_url,
-        t.plat_audit_status AS plat_audit_status,
-        t.task_info_img AS task_info_img
-        FROM wm_task t
-        left join sys_user u on u.user_id=t.task_user_id
-        left join sys_dept d on d.dept_id=t.dept_id
-        left join wm_score_package p on p.id=t.score_package_id
-        where t.del_flag=0
-        and t.real_flag=0
-        and t.task_status !='1'
-        <if test="query.taskUserId!=null and query.taskUserId!=''">
-            and t.task_user_id = #{query.taskUserId}
-        </if>
-        <if test="query.taskTypeId != null and query.taskTypeId != ''">
-            and t.task_type_id = #{query.taskTypeId}
-        </if>
-        <if test="query.taskStatus!=null and query.taskStatus!=''">
-            and t.task_status in (${query.taskStatus})
-        </if>
-        <if test="query.scorePackageId!=null and query.scorePackageId!=''">
-            and t.score_package_id in (${query.scorePackageId})
-        </if>
-        <if test="query.taskUserType != null and query.taskUserType != ''">
-            and t.task_user_type in (${query.taskUserType})
-        </if>
-        order by t.lookinto_date
-    </select>
-
-    <!-- 根据配置查询任务 -->
-    <select id="listWmTaskByWrapper" resultMap="wmTaskMap">
-        SELECT t.id                 AS id,
-               t.task_rule_id       AS task_rule_id,
-               t.score              AS score,
-               p.score_package_name,
-               p.score_package_name AS score_package_id,
-               t.task_type_id       AS task_type_id,
-               t.lookinto_date      AS lookinto_date,
-               t.province           AS province,
-               t.city               AS city,
-               t.area               AS area,
-               t.address            AS address,
-               t.lookinto_type_id   AS lookinto_type_id,
-               t.task_content_id    AS task_content_id,
-               t.task_status        AS task_status,
-               u.realname           AS task_user_id,
-               t.task_user_type     AS task_user_type,
-               t.drug_ent_id        AS drug_ent_id,
-               d.`name`             AS dept_id,
-               t.del_flag           AS del_flag,
-               t.enable_flag        AS enable_flag,
-               t.tenant_id          AS tenant_id,
-               t.lookinto_date      AS create_time,
-               t.create_user        AS create_user,
-               t.update_time        AS update_time,
-               t.update_user        AS update_user,
-               t.submit_status      AS submit_status,
-               t.share_img_url      AS share_img_url,
-               t.plat_audit_status  AS plat_audit_status,
-               t.task_info_img      AS task_info_img,
-               t.approval_user_id,
-               t.approval_time,
-               t.dept_approval_user_id,
-               t.dept_approval_time
-        FROM wm_task t
-                 LEFT JOIN sys_user u ON u.user_id = t.task_user_id
-                 LEFT JOIN sys_dept d ON d.dept_id = t.dept_id
-                 LEFT JOIN wm_score_package p ON p.id = t.score_package_id
-            ${ew.customSqlSegment}
-    </select>
-
-    <select id="selectByTask" resultMap="wmTaskMap">
-        select t.* FROM wm_task t
-        where t.del_flag=0
-        <if test="query.id!=null and query.id!=''">
-            and t.id = #{query.id}
-        </if>
-        <if test="query.scorePackageId!=null and query.scorePackageId!=''">
-            and t.score_package_id = #{query.scorePackageId}
-        </if>
-        <if test="query.taskUserId!=null and query.taskUserId!=''">
-            and t.task_user_id = #{query.taskUserId}
-        </if>
-        <if test="query.enableFlag!=null and query.enableFlag!=''">
-            and t.enable_flag in (${query.enableFlag})
-        </if>
-
-
-    </select>
-
-    <select id="PackageIsFinishByTask" resultType="java.util.HashMap">
-        SELECT tt.*
-        FROM (SELECT b.num,
-                     a.task_num,
-                     b.scoreSum,
-                     a.user_score,
-                     CASE
-
-                         WHEN b.package_type1 = '1' THEN
-                             b.user_score - b.scoreSum
-                         WHEN (b.package_type1 = '2' OR b.package_type1 = '3') THEN
-                             b.task_num - b.num
-                         ELSE '1'
-                         END AS isFinish,
-                     a.id
-              FROM wm_score_package_status a
-                       LEFT JOIN (SELECT s.id,
-                                         p.package_type1,
-                                         COUNT(t.id)                                                       AS num,
-                                         SUM(t.score)                                                      AS scoreSum,
-                                         CASE WHEN s.user_score IS NULL THEN p.score ELSE s.user_score END AS user_score,
-                                         CASE WHEN s.task_num IS NULL THEN p.task_num ELSE s.task_num END  AS task_num
-                                  FROM wm_score_package_status s
-                                           LEFT JOIN wm_score_package p ON s.package_id = p.id
-                                           LEFT JOIN wm_task t ON t.score_package_id = p.id
-                                      AND s.user_id = t.task_user_id
-                                  WHERE s.del_flag = 0
-                                    AND s.enable_flag = 0
-                                    AND s.`status` != 3
+      </if>
+
+
+      <if test="query.createTime != null and query.createTime != ''">
+        AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
+      </if>
+
+      <if test="query.updateTime != null and query.updateTime != ''">
+        AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
+      </if>
+
+      <if test="query.drugEntId != null and query.drugEntId != ''">
+        AND <![CDATA[ wm_task.drug_ent_id<=#{query.drugEntId}]]>
+      </if>
+    </where>
+  </select>
+
+
+  <select id="getTaskListByPackageIds" resultType="java.util.HashMap">
+    select * from (SELECT
+    package_id,
+    score_name,
+    base_id,
+    sum(score) score,
+    count(1) score_count,
+    realname,
+    dept_name,
+    DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    group by
+    package_id,
+    score_name,
+    base_id,
+    realname,
+    dept_name
+    ) a ORDER BY a.dept_name,a.score_name,a.realname
+  </select>
+
+  <select id="getTaskListByPackageIdsAndUser" resultType="java.util.HashMap">
+    SELECT
+    *
+    FROM
+    (
+    SELECT
+    score_name,
+    sum( score ) score,
+    count( 1 ) score_count,
+    realname,
+    dept_name
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    GROUP BY
+    score_name,
+    dept_name,
+    realname
+    ) A
+    ORDER BY
+    A.dept_name,
+    a.score_name,
+    a.realname
+  </select>
+
+
+  <select id="getTaskListByPackageIdsCount" resultType="java.util.HashMap">
+    SELECT
+    base_id taskTypeName,
+    sum( score ) taskSum,
+    count( 1 ) taskCount
+    FROM
+    wm_zb_count
+    WHERE
+    package_id IN (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+
+    GROUP BY
+    base_id
+  </select>
+
+  <select id="getTaskListByPackageIdsZd" resultType="java.util.HashMap">
+    SELECT
+    DATE_FORMAT(min( create_time ),'%Y-%m-%d') mindate,
+    DATE_FORMAT(max( create_time ),'%Y-%m-%d') maxdate,
+    GROUP_CONCAT( DISTINCT realname ) realname,
+    sum( score ) sumscore,
+    GROUP_CONCAT( DISTINCT task_rule_id ) task_rule_id
+    FROM
+    wm_zb_count
+    where package_id IN (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    or
+    package_id IN (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+  </select>
+
+
+  <select id="getTaskListByPackageIdsReturnWmtaskInfo" resultMap="wmTaskMap">
+    SELECT
+    *
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+
+    order by task_user_id asc,create_time asc
+
+  </select>
+
+  <select id="selectZbCount" resultType="java.util.HashMap">
+    select * from (select * from (SELECT
+    package_id,
+    score_name,
+    send_package_dept_id,
+    dept_id,
+    sum(score) score,
+    count(1) score_count,
+    realname,
+    dept_name,
+    DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
+    DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    group by
+    package_id,
+    score_name,
+    send_package_dept_id,
+    dept_id,
+    package_score,
+    realname,
+    dept_name
+    ) a ORDER BY a.dept_name,a.score_name,a.realname ) b
+  </select>
+
+  <select id="selectByWmTaskOne" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_one_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByWmTaskSecond" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_second_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByWmTaskDrug" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_drug_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+  </select>
+
+  <select id="selectByWmTaskId" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+      AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
+      AND del_flag = 0
+      AND enable_flag = 0
+  </select>
+
+  <select id="selectByReportOneApprovalStatus" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_one_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+    and
+    report_one_approval_status = #{query.reportOneApprovalStatus,jdbcType=VARCHAR}
+    group by dept_id, report_one_approval_status, score_package_id
+  </select>
+
+  <select id="selectByReportSecondApprovalStatus" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_second_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+    and
+    report_second_approval_status = #{query.reportSecondApprovalStatus,jdbcType=VARCHAR}
+    group by dept_id, report_second_approval_status, score_package_id
+  </select>
+
+  <select id="selectByReportDrugApprovalStatus" resultType="java.util.HashMap">
+    select
+    sum(score) score,
+    count(1) score_count,
+    dept_id,
+    report_drug_approval_status,
+    score_package_id
+    from wm_task
+    where score_package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and
+    task_status = #{query.taskStatus,jdbcType=VARCHAR}
+    and
+    report_drug_approval_status = #{query.reportDrugApprovalStatus,jdbcType=VARCHAR}
+    group by dept_id, report_drug_approval_status, score_package_id
+  </select>
+  <select id="selectById" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE id = #{query.Id,jdbcType=BIGINT}
+  </select>
+
+  <select id="selectByRealFlag" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE id = #{Id,jdbcType=BIGINT}
+      AND real_flag = 0
+  </select>
+
+  <select id="selectWmTaskById" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE id = #{query.id,jdbcType=BIGINT}
+      AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
+  </select>
+  <select id="selectListByIds" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+      AND real_flag = 0
+  </select>
+  <select id="selectListByScorePackageId" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+      AND task_status = #{query.taskStatus,jdbcType=VARCHAR}
+      AND del_flag = 0
+      AND enable_flag = 0
+  </select>
+  <select id="getTaskListByPackageIdsForJs" resultType="java.util.HashMap">
+    select * from (select * from (SELECT
+    package_id,
+    score_name,
+    package_score,
+    sum(score) score,
+    count(1) score_count,
+    realname,
+    dept_name,
+    DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
+    DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    group by
+    package_id,
+    score_name,
+    package_score,
+    realname,
+    dept_name
+    ) a ORDER BY a.dept_name,a.score_name,a.realname ) b
+
+    union
+
+    SELECT
+    "" package_id,
+    "" score_name,
+    package_score,
+    sum(score) score,
+    count(1) score_count,
+    "合计" realname,
+    "" dept_name,
+    "" create_time,
+    "" pcreate_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+  </select>
+
+  <select id="getTaskListByPackageIdsForJsUser" resultType="java.util.HashMap">
+    select * from (SELECT
+    *
+    FROM
+    (
+    SELECT
+    sum( score ) score,
+    count( 1 ) score_count,
+    user_id,
+    realname,
+    phone,
+    dept_name,
+    DATE_FORMAT( max( create_time ), '%Y-%m-%d' ) create_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    GROUP BY
+    user_id,
+    realname,
+    phone,
+    dept_name
+    ) a
+    ORDER BY
+    a.dept_name,
+    a.realname) bb
+    UNION
+    SELECT
+    sum( score ) score,
+    count( 1 ) score_count,
+    "" user_id,
+    "合计" realname,
+    "" phone,
+    ""dept_name,
+    "" create_time
+    FROM
+    wm_zb_count
+    where package_id in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+  </select>
+
+
+  <select id="getH5PackageList" resultType="java.util.HashMap">
+    SELECT
+    p.id id ,
+    p.score_package_name as score_name,u.realname,
+    p.package_type1 as type1,
+    u.phone,
+    u.user_id as userId,
+    sum( ifnull(t.score, 0) ) taskSum,
+    count( 1 ) taskCount
+    FROM
+    wm_task t
+    left join wm_score_package p on p.id=t.score_package_id
+    left join sys_user u on u.user_id=t.task_user_id
+    where p.score_package_name in (
+    <foreach collection="query.extIds" item="pid" index="index" separator=",">
+      #{pid}
+    </foreach>
+    )
+    and t.task_status=3
+    and t.del_flag=0
+    and t.enable_flag=0
+    GROUP BY
+    p.id,p.score_package_name,u.realname,u.phone
+  </select>
+
+
+  <select id="getH5TaskList" resultType="java.util.HashMap">
+    SELECT t.id                                   id,
+           p.score_package_name AS                score_name,
+           p.package_type2      AS                `type`,
+           p.package_type1      AS                type1,
+           u.realname,
+           e.task_type_name,
+           date_format(t.create_time, '%Y-%m-%d') create_time,
+           ifnull(t.score, 0)                     tasksum,
+           ifnull(t.score, 0)                     taskcount
+    FROM wm_task t
+           LEFT JOIN wm_score_package p ON p.id = t.score_package_id
+           LEFT JOIN sys_user u ON u.user_id = t.task_user_id
+           LEFT JOIN wm_task_type e ON e.id = t.task_type_id
+    WHERE p.id = #{query.scorePackageId}
+      AND t.task_status = 3
+      AND t.task_user_id = #{query.taskUserId}
+      AND t.del_flag = 0
+      AND t.enable_flag = 0
+    ORDER BY t.create_time DESC
+
+  </select>
+
+
+  <select id="getTaskListByIds" resultType="java.util.HashMap">
+    select * from (
+    SELECT
+    p.id AS package_id,
+    p.score_package_name AS score_name,
+    c.realname AS realname,
+    d.name AS dept_name,
+    m.label AS base_id,
+    sum(t.score) score,
+    count(1) score_count,
+    DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+    JOIN wm_task_type b
+    left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+    JOIN sys_user c
+    JOIN sys_dept d
+    WHERE b.id = t.task_type_id
+    AND c.user_id = t.task_user_id
+    AND c.dept_id = d.dept_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    and t.real_flag = '0'
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    group by
+    p.id,
+    p.score_package_name,
+    m.label,
+    c.realname,
+    d.name
+    )a ORDER BY a.dept_name,a.score_name,a.realname
+  </select>
+
+  <select id="getTaskListByIdsOld" resultType="java.util.HashMap">
+    select * from (
+    SELECT
+    p.id AS package_id,
+    p.score_package_name AS score_name,
+    c.realname AS realname,
+    d.name AS dept_name,
+    m.label AS base_id,
+    sum(t.score) score,
+    count(1) score_count,
+    DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_drug_id = p.id
+    JOIN wm_task_type b
+    left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+    JOIN sys_user c
+    JOIN sys_dept d
+    WHERE b.id = t.task_type_id
+    AND c.user_id = t.task_user_id
+    AND c.dept_id = d.dept_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    and t.real_flag = '0'
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    group by
+    p.id,
+    p.score_package_name,
+    m.label,
+    c.realname,
+    d.name
+    )a ORDER BY a.dept_name,a.score_name,a.realname
+  </select>
+
+  <select id="getTaskListByIdsJs" resultType="java.util.HashMap">
+    select * from (
+    SELECT
+    p.id AS package_id,
+    p.score_package_name AS score_name,
+    c.realname AS realname,
+    d.name AS dept_name,
+    m.label AS base_id,
+    sum(t.score) score,
+    count(1) score_count,
+    DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+    JOIN wm_task_type b
+    left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+    JOIN sys_user c
+    JOIN sys_dept d
+    WHERE b.id = t.task_type_id
+    AND c.user_id = t.task_user_id
+    and d.dept_id=t.dept_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    and p.package_type2=2
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    group by
+    p.id,
+    p.score_package_name,
+    m.label,
+    c.realname,
+    d.name
+    )a ORDER BY a.dept_name,a.score_name,a.realname
+  </select>
+
+
+  <select id="getTaskListByIdsReturnWmtaskInfo" resultMap="wmTaskMap">
+    SELECT
+    t.id AS id,
+    t.task_rule_id AS task_rule_id,
+    t.score AS score,
+    t.score_package_drug_id AS score_package_drug_id,
+    t.score_package_level1_id AS score_package_level1_id,
+    t.score_package_id AS score_package_id,
+    t.task_type_id AS task_type_id,
+    t.lookinto_date AS lookinto_date,
+    t.province AS province,
+    t.city AS city,
+    t.area AS area,
+    t.address AS address,
+    t.lookinto_type_id AS lookinto_type_id,
+    t.task_content_id AS task_content_id,
+    t.task_status AS task_status,
+    t.task_user_id AS task_user_id,
+    t.task_user_type AS task_user_type,
+    t.drug_ent_id AS drug_ent_id,
+    t.dept_id AS dept_id,
+    t.del_flag AS del_flag,
+    t.enable_flag AS enable_flag,
+    t.tenant_id AS tenant_id,
+    t.lookinto_date AS create_time,
+    t.create_user AS create_user,
+    t.update_time AS update_time,
+    t.update_user AS update_user,
+    t.submit_status AS submit_status,
+    t.share_img_url AS share_img_url,
+    t.plat_audit_status AS plat_audit_status,
+    t.ext_ids AS ext_ids,
+    t.task_info_img AS task_info_img
+    FROM wm_task t
+    where 1=1
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    order by t.task_user_id asc,t.create_time asc
+  </select>
+
+  <select id="getTaskListByIdsCount" resultType="java.util.HashMap">
+    SELECT
+    m.label AS taskTypeName,
+    sum( t.score ) taskSum,
+    count( 1 ) taskCount
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+    JOIN wm_task_type b
+    left join sys_dict_item m on m.type='score_task_type' and m.`value`=b.parent_id
+    WHERE b.id = t.task_type_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    GROUP BY
+    m.label
+  </select>
+
+  <select id="getTaskListByIdsZd" resultType="java.util.HashMap">
+    SELECT
+    DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
+    DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
+    GROUP_CONCAT( DISTINCT c.realname ) realname,
+    sum( t.score ) sumscore,
+    GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+    JOIN wm_task_type b
+    JOIN sys_user c
+    JOIN sys_dept d
+    WHERE b.id = t.task_type_id
+    AND c.user_id = t.task_user_id
+    AND c.dept_id = d.dept_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    ORDER BY
+    t.task_rule_id,
+    t.task_user_id,
+    t.lookinto_date
+
+  </select>
+
+  <select id="getTaskListByIdsZdJs" resultType="java.util.HashMap">
+    SELECT
+    DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
+    DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
+    GROUP_CONCAT( DISTINCT c.realname ) realname,
+    sum( t.score ) sumscore,
+    GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
+    FROM wm_task t
+    LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+    JOIN wm_task_type b
+    JOIN sys_user c
+    JOIN sys_dept d
+    WHERE b.id = t.task_type_id
+    AND c.user_id = t.task_user_id
+    AND t.dept_id = d.dept_id
+    and t.task_status=3
+    and t.enable_flag=0
+    and t.del_flag=0
+    and p.package_type2=2
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+    ORDER BY
+    t.task_rule_id,
+    t.task_user_id,
+    t.lookinto_date
+
+  </select>
+
+  <select id="getWmTaskList" resultMap="wmTaskMap">
+    SELECT
+    t.id AS id,
+    t.task_number,
+    t.task_rule_id AS task_rule_id,
+    t.score AS score,
+    p2.id AS score_package_drug_id,
+    p1.id AS score_package_level1_id,
+    p.score_package_name,
+    p.score_package_name AS score_package_id,
+    t.task_type_id AS task_type_id,
+    t.lookinto_date AS lookinto_date,
+    t.real_flag AS realFlag,
+    t.province AS province,
+    t.city AS city,
+    t.area AS area,
+    t.address AS address,
+    t.lookinto_type_id AS lookinto_type_id,
+    t.task_content_id AS task_content_id,
+    t.task_status AS task_status,
+    u.realname AS task_user_id,
+    t.task_user_type AS task_user_type,
+    t.drug_ent_id AS drug_ent_id,
+    d.`name` AS dept_id,
+    t.del_flag AS del_flag,
+    t.enable_flag AS enable_flag,
+    t.tenant_id AS tenant_id,
+    t.lookinto_date AS create_time,
+    t.create_user AS create_user,
+    t.update_time AS update_time,
+    t.update_user AS update_user,
+    t.submit_status AS submit_status,
+    t.share_img_url AS share_img_url,
+    t.plat_audit_status AS plat_audit_status,
+    t.task_info_img AS task_info_img,
+    t.review_task_count,
+    t.report_drug_id,
+    t.report_one_id,
+    t.report_second_id,
+    t.task_status_info,
+    t.approval_user_id,
+    t.approval_time,
+    t.dept_approval_user_id,
+    t.dept_approval_time
+    FROM wm_task t
+    left join sys_user u on u.user_id=t.task_user_id
+    left join sys_dept d on d.dept_id=t.dept_id
+    left join wm_score_package p on p.id=t.score_package_id
+    left join wm_score_package p1 on p1.id=t.score_package_level1_id
+    left join wm_score_package p2 on p1.id=t.score_package_drug_id
+    where t.del_flag=0
+    and t.real_flag=0
+    and t.task_status !='1'
+    <if test="query.scorePackageDrugId!=null and query.scorePackageDrugId!=''">
+      and t.score_package_drug_id = #{query.scorePackageDrugId}
+    </if>
+    <if test="query.scorePackageLevel1Id!=null and query.scorePackageLevel1Id!=''">
+      and t.score_package_level1_id = #{query.scorePackageLevel1Id}
+    </if>
+    <if test="query.scorePackageId!=null and query.scorePackageId!=''">
+      and t.score_package_id = #{query.scorePackageId}
+    </if>
+    <if test="query.id!=null and query.id!=''">
+      and t.id = #{query.id}
+    </if>
+    <if test="query.taskStatus!=null and query.taskStatus!=''">
+      and t.task_status = #{query.taskStatus}
+    </if>
+    <if test="query.taskUserId!=null and query.taskUserId!=''">
+      and t.task_user_id = #{query.taskUserId}
+    </if>
+    <if test="query.taskNumber != null and query.taskNumber != ''">
+      and t.task_number like concat('%', #{query.taskNumber}, '%')
+    </if>
+    <if test="query.taskTypeId != null and query.taskTypeId != ''">
+      and t.task_type_id = #{query.taskTypeId}
+    </if>
+    order by t.lookinto_date
+
+  </select>
+
+  <!-- 根据配置查询任务 -->
+  <select id="listWmTaskByConfig" resultMap="wmTaskMap">
+    SELECT
+    t.id AS id,
+    t.task_rule_id AS task_rule_id,
+    t.score AS score,
+    p.score_package_name AS score_package_id,
+    t.task_type_id AS task_type_id,
+    t.lookinto_date AS lookinto_date,
+    t.province AS province,
+    t.city AS city,
+    t.area AS area,
+    t.address AS address,
+    t.lookinto_type_id AS lookinto_type_id,
+    t.task_content_id AS task_content_id,
+    t.task_status AS task_status,
+    u.realname AS task_user_id,
+    t.task_user_type AS task_user_type,
+    t.drug_ent_id AS drug_ent_id,
+    d.`name` AS dept_id,
+    t.del_flag AS del_flag,
+    t.enable_flag AS enable_flag,
+    t.tenant_id AS tenant_id,
+    t.lookinto_date AS create_time,
+    t.create_user AS create_user,
+    t.update_time AS update_time,
+    t.update_user AS update_user,
+    t.submit_status AS submit_status,
+    t.share_img_url AS share_img_url,
+    t.plat_audit_status AS plat_audit_status,
+    t.task_info_img AS task_info_img
+    FROM wm_task t
+    left join sys_user u on u.user_id=t.task_user_id
+    left join sys_dept d on d.dept_id=t.dept_id
+    left join wm_score_package p on p.id=t.score_package_id
+    where t.del_flag=0
+    and t.real_flag=0
+    and t.task_status !='1'
+    <if test="query.taskUserId!=null and query.taskUserId!=''">
+      and t.task_user_id = #{query.taskUserId}
+    </if>
+    <if test="query.taskTypeId != null and query.taskTypeId != ''">
+      and t.task_type_id = #{query.taskTypeId}
+    </if>
+    <if test="query.taskStatus!=null and query.taskStatus!=''">
+      and t.task_status in (${query.taskStatus})
+    </if>
+    <if test="query.scorePackageId!=null and query.scorePackageId!=''">
+      and t.score_package_id in (${query.scorePackageId})
+    </if>
+    <if test="query.taskUserType != null and query.taskUserType != ''">
+      and t.task_user_type in (${query.taskUserType})
+    </if>
+    order by t.lookinto_date
+  </select>
+
+  <!-- 根据配置查询任务 -->
+  <select id="listWmTaskByWrapper" resultMap="wmTaskMap">
+    SELECT t.id                 AS id,
+           t.task_rule_id       AS task_rule_id,
+           t.score              AS score,
+           p.score_package_name,
+           p.score_package_name AS score_package_id,
+           t.task_type_id       AS task_type_id,
+           t.lookinto_date      AS lookinto_date,
+           t.province           AS province,
+           t.city               AS city,
+           t.area               AS area,
+           t.address            AS address,
+           t.lookinto_type_id   AS lookinto_type_id,
+           t.task_content_id    AS task_content_id,
+           t.task_status        AS task_status,
+           u.realname           AS task_user_id,
+           t.task_user_type     AS task_user_type,
+           t.drug_ent_id        AS drug_ent_id,
+           d.`name`             AS dept_id,
+           t.del_flag           AS del_flag,
+           t.enable_flag        AS enable_flag,
+           t.tenant_id          AS tenant_id,
+           t.lookinto_date      AS create_time,
+           t.create_user        AS create_user,
+           t.update_time        AS update_time,
+           t.update_user        AS update_user,
+           t.submit_status      AS submit_status,
+           t.share_img_url      AS share_img_url,
+           t.plat_audit_status  AS plat_audit_status,
+           t.task_info_img      AS task_info_img,
+           t.approval_user_id,
+           t.approval_time,
+           t.dept_approval_user_id,
+           t.dept_approval_time
+    FROM wm_task t
+           LEFT JOIN sys_user u ON u.user_id = t.task_user_id
+           LEFT JOIN sys_dept d ON d.dept_id = t.dept_id
+           LEFT JOIN wm_score_package p ON p.id = t.score_package_id
+      ${ew.customSqlSegment}
+  </select>
+
+  <select id="selectByTask" resultMap="wmTaskMap">
+    select t.* FROM wm_task t
+    where t.del_flag=0
+    <if test="query.id!=null and query.id!=''">
+      and t.id = #{query.id}
+    </if>
+    <if test="query.scorePackageId!=null and query.scorePackageId!=''">
+      and t.score_package_id = #{query.scorePackageId}
+    </if>
+    <if test="query.taskUserId!=null and query.taskUserId!=''">
+      and t.task_user_id = #{query.taskUserId}
+    </if>
+    <if test="query.enableFlag!=null and query.enableFlag!=''">
+      and t.enable_flag in (${query.enableFlag})
+    </if>
+
+
+  </select>
+
+  <select id="PackageIsFinishByTask" resultType="java.util.HashMap">
+    SELECT tt.*
+    FROM (SELECT b.num,
+                 a.task_num,
+                 b.scoresum,
+                 a.user_score,
+                 CASE
+
+                   WHEN b.package_type1 = '1' THEN
+                     b.user_score - b.scoresum
+                   WHEN (b.package_type1 = '2' OR b.package_type1 = '3') THEN
+                     b.task_num - b.num
+                   ELSE '1'
+                   END AS isfinish,
+                 a.id
+          FROM wm_score_package_status a
+                 LEFT JOIN (SELECT s.id,
+                                   p.package_type1,
+                                   COUNT(t.id)                                                       AS num,
+                                   SUM(t.score)                                                      AS scoresum,
+                                   CASE WHEN s.user_score IS NULL THEN p.score ELSE s.user_score END AS user_score,
+                                   CASE WHEN s.task_num IS NULL THEN p.task_num ELSE s.task_num END  AS task_num
+                            FROM wm_score_package_status s
+                                   LEFT JOIN wm_score_package p ON s.package_id = p.id
+                                   LEFT JOIN wm_task t ON t.score_package_id = p.id
+                              AND s.user_id = t.task_user_id
+                            WHERE s.del_flag = 0
+                              AND s.enable_flag = 0
+                              AND s.`status` != 3
                                     AND p.del_flag = 0
                                     AND t.del_flag = 0
                                     AND t.task_status = 3
                                     AND p.id = #{query.scorePackageId}
-                                  GROUP BY s.id,
-                                           p.package_type1) b ON a.id = b.id
-              WHERE a.del_flag = 0
-                AND a.`status` != 3
+                            GROUP BY s.id,
+                              p.package_type1) b ON a.id = b.id
+          WHERE a.del_flag = 0
+            AND a.`status` != 3
                 AND a.enable_flag = 0
                 AND a.package_id = #{query.scorePackageId}) tt
-    </select>
-
-    <select id="getMaxCreateTime" resultType="java.util.HashMap">
-        select max(t.lookinto_date) as MaxTime from wm_task t
-        where 1=1
-        <if test="query.id!=null and query.id!=''">
-            AND t.id in(${query.id})
-        </if>
-    </select>
-
-    <select id="selectListByWmTask" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task
-        WHERE score_package_id
-            IN (SELECT id
-                FROM wm_score_package
-                WHERE id = #{query.id}
-                UNION ALL
-                SELECT id
-                FROM wm_score_package
-                WHERE relation_score_id = #{query.id}
-                UNION ALL
-                SELECT id
-                FROM wm_score_package
-                WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE relation_score_id = #{query.id})
-                UNION ALL
-                SELECT id
-                FROM wm_score_package
-                WHERE relation_score_id IN
-                      (SELECT id FROM wm_score_package WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE relation_score_id = #{query.id})))
-          AND task_status = 3
-          AND (
-            (report_drug_approval_status IN (5, 6) AND report_drug_approval_opinion = 1)
-                OR (report_one_approval_status IN (5, 6) AND report_one_approval_opinion = 1)
-            )
-    </select>
-
-
-    <select id="selectSettleTask" resultType="java.util.HashMap">
-        select t.id,
-        t.task_type_id as taskTypeId
-        ,p.task_type_name as taskTypeName
-        ,t.lookinto_date as lookintoDate
-        ,c.temp1,c.temp2,c.temp3,c.temp4
-        from wm_task t
-        left join wm_task_type p on t.task_type_id=p.id
-        left join wm_task_content c on c.id=t.task_content_id
-        where t.del_flag=0
-        <if test="query.id!=null and query.id!=''">
-            and t.id = #{query.id}
-        </if>
-        <if test="query.scorePackageId!=null and query.scorePackageId!=''">
-            and t.score_package_id = #{query.scorePackageId}
-        </if>
-        <if test="query.taskUserId!=null and query.taskUserId!=''">
-            and t.task_user_id = #{query.taskUserId}
-        </if>
-        <if test="query.enableFlag!=null and query.enableFlag!=''">
-            and t.enable_flag in (${query.enableFlag})
-        </if>
-        order by t.create_time desc
-    </select>
-
-    <select id="getUserTaskSubScore" resultType="java.lang.Integer">
-        SELECT IFNULL(SUM(t.score), 0)
-        FROM wm_task t,
-             wm_score_package p
-        WHERE t.score_package_id = p.id
-          AND p.package_type1 = '1'
-          AND t.task_status != '4'
-          AND t.task_user_id = #{userId,jdbcType=VARCHAR}
-          AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP})
-    </select>
-
-    <select id="newGetUserTaskSubScore" resultType="java.lang.Integer">
-        SELECT IFNULL(SUM(t.score), 0)
-        FROM wm_task t,
-             wm_score_package p
-        WHERE t.score_package_id = p.id
-          AND p.package_type1 = '1'
-          AND t.real_flag = '0'
-          AND t.task_status = '3'
+  </select>
+
+  <select id="getMaxCreateTime" resultType="java.util.HashMap">
+    select max(t.lookinto_date) as MaxTime from wm_task t
+    where 1=1
+    <if test="query.id!=null and query.id!=''">
+      AND t.id in(${query.id})
+    </if>
+  </select>
+
+  <select id="selectListByWmTask" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task
+    WHERE score_package_id
+      IN (SELECT id
+          FROM wm_score_package
+          WHERE id = #{query.id}
+          UNION ALL
+          SELECT id
+          FROM wm_score_package
+          WHERE relation_score_id = #{query.id}
+          UNION ALL
+          SELECT id
+          FROM wm_score_package
+          WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE relation_score_id = #{query.id})
+          UNION ALL
+          SELECT id
+          FROM wm_score_package
+          WHERE relation_score_id IN
+                (SELECT id FROM wm_score_package WHERE relation_score_id IN (SELECT id FROM wm_score_package WHERE relation_score_id = #{query.id})))
+      AND task_status = 3
+      AND (
+      (report_drug_approval_status IN (5, 6) AND report_drug_approval_opinion = 1)
+        OR (report_one_approval_status IN (5, 6) AND report_one_approval_opinion = 1)
+      )
+  </select>
+
+
+  <select id="selectSettleTask" resultType="java.util.HashMap">
+    select t.id,
+    t.task_type_id as taskTypeId
+    ,p.task_type_name as taskTypeName
+    ,t.lookinto_date as lookintoDate
+    ,c.temp1,c.temp2,c.temp3,c.temp4
+    from wm_task t
+    left join wm_task_type p on t.task_type_id=p.id
+    left join wm_task_content c on c.id=t.task_content_id
+    where t.del_flag=0
+    <if test="query.id!=null and query.id!=''">
+      and t.id = #{query.id}
+    </if>
+    <if test="query.scorePackageId!=null and query.scorePackageId!=''">
+      and t.score_package_id = #{query.scorePackageId}
+    </if>
+    <if test="query.taskUserId!=null and query.taskUserId!=''">
+      and t.task_user_id = #{query.taskUserId}
+    </if>
+    <if test="query.enableFlag!=null and query.enableFlag!=''">
+      and t.enable_flag in (${query.enableFlag})
+    </if>
+    order by t.create_time desc
+  </select>
+
+  <select id="getUserTaskSubScore" resultType="java.lang.Integer">
+    SELECT ifnull(SUM(t.score), 0)
+    FROM wm_task t,
+         wm_score_package p
+    WHERE t.score_package_id = p.id
+      AND p.package_type1 = '1'
+      AND t.task_status != '4'
           AND t.task_user_id = #{userId,jdbcType=VARCHAR}
-          AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP})
-    </select>
-
-    <!-- 患者教育-处方列表-分页 -->
-    <select id="listTaskPrescriptionPage" resultMap="wmTaskWithContentMap">
-        SELECT
-        *
-        FROM
-        wm_task t
-        LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
-        <where>
-            t.del_flag = 0
-            AND t.real_flag = 0
-            AND task_status = 3
-            AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
-            <if test="prescriptionNo != null and prescriptionNo != ''">
-                AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
-            </if>
-        </where>
-    </select>
-
-    <!-- 患者教育-处方列表 -->
-    <select id="listTaskPrescription" resultMap="wmTaskWithContentMap">
-        SELECT
-        *
-        FROM
-        wm_task t
-        LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
-        <where>
-            t.del_flag = 0
-            AND t.real_flag = 0
-            AND task_status = 3
-            AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
-            <if test="prescriptionNo != null and prescriptionNo != ''">
-                AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
-            </if>
-        </where>
-    </select>
-
-    <!-- 查询调查信息审核列表 -->
-    <select id="listInfoAudit" resultMap="wmTaskMap">
-        SELECT
-        temp.*, u.realname AS task_user_name, u.username
-        FROM
-        (
-        SELECT max(id) AS id, max(task_user_id) AS task_user_id, max(create_time) AS create_time,
-        max(approval_info) AS approval_info, max(plat_audit_status) AS plat_audit_status,
-        max(task_status) AS task_status, task_content_id, task_type_id
-        FROM wm_task
-        <where>
-            del_flag = '0' AND enable_flag = '0' AND (task_type_id IN ('15', '16', '18', '30') AND task_from != '2')
-            <if test="query.taskTypeId != null and query.taskTypeId != ''">
-                AND task_type_id = #{query.taskTypeId, jdbcType=VARCHAR}
-            </if>
-            <if test="query.platAuditStatus != null and query.platAuditStatus != ''">
-                AND plat_audit_status = #{query.platAuditStatus, jdbcType=VARCHAR}
-            </if>
-            <if test="startDate != null and endDate != null">
-                AND create_time BETWEEN #{startDate, jdbcType=TIMESTAMP} AND #{endDate, jdbcType=TIMESTAMP}
-            </if>
-        </where>
-        GROUP BY task_content_id, task_type_id
-        ) temp
-        LEFT JOIN sys_user u ON u.user_id = temp.task_user_id
-        ORDER BY temp.create_time DESC
-    </select>
-
-    <!-- 查询同一家医院一个月做的任务 -->
-    <select id="listCurrentMonthHospitalTask" resultMap="wmTaskMap">
-        SELECT t.*
-        FROM wm_task t
-                 LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
-        WHERE t.task_status IN (1, 2, 3)
-          AND t.enable_flag = 0
-          AND t.del_flag = 0
-          AND YEAR(t.create_time) = YEAR(CURDATE())
-          AND MONTH(t.create_time) = MONTH(CURDATE())
-          AND tc.temp29 = #{hospitalId}
-    </select>
-
-    <!-- 查询非审核不通过的会议任务个数 -->
-    <select id="countMeetingTask" resultType="java.lang.Long">
-        SELECT COUNT(*)
-        FROM wm_task
-        LEFT JOIN wm_task_content ON wm_task.task_content_id = wm_task_content.id
-        WHERE wm_task.task_type_id IN
-        <foreach collection="taskTypeList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        AND wm_task.task_user_id = #{taskUserId}
-        AND wm_task_content.temp4 BETWEEN #{startTime} AND #{endTime}
-        AND wm_task.task_status != 4
-    </select>
-
-    <!-- 企业审核查询任务列表 -->
-    <select id="entTaskPageByTaskType" resultType="com.qunzhixinxi.hnqz.admin.api.vo.WmTaskVO">
-        select t.*, p.typeid, p.score_package_name
-        from wm_task t
-        left join wm_score_package p on p.id = t.score_package_id
-        where t.task_type_id in
-        <foreach collection="query.taskTypeIdList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        and (
-        t.report_one_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
-        or
-        t.report_second_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
-        or
-        t.report_drug_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
-        )
-        <if test="query.approvedStatus != null and query.waitFlag == false">
-            and (
-            <if test="query.deptLevel == 2">
-                t.report_drug_approval_opinion in
-            </if>
-            <if test="query.deptLevel != 2">
-                t.report_one_approval_opinion in
-            </if>
-            <foreach collection="query.entTaskStatus" item="item" index="index" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-            )
-        </if>
-        <if test="query.approvedStatus == null and query.waitFlag == true">
-            and (
-            <if test="query.deptLevel == 2">
-                t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0
-            </if>
-            <if test="query.deptLevel != 2">
-                t.report_one_approval_opinion is null and t.report_one_approval_status = 0
-            </if>
-            )
-        </if>
-        <if test="query.approvedStatus == 1 and query.waitFlag == true">
-            and (
-            <if test="query.deptLevel == 2">
-                (t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0)
-                or t.report_drug_approval_opinion != '2'
-            </if>
-            <if test="query.deptLevel != 2">
-                (t.report_one_approval_opinion is null and t.report_one_approval_status = 0)
-                or t.report_one_approval_opinion != '2'
-            </if>
-            )
-        </if>
-        <if test="query.approvedStatus == 2 and query.waitFlag == true">
-            and (
-            <if test="query.deptLevel == 2">
-                (t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0)
-                or t.report_drug_approval_opinion != '1'
-            </if>
-            <if test="query.deptLevel != 2">
-                (t.report_one_approval_opinion is null and t.report_one_approval_status = 0)
-                or t.report_one_approval_opinion != '1'
-            </if>
-            )
-        </if>
-
-    </select>
-
-    <select id="listAvailableTaskForSupervision" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task t
-        LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
-        WHERE c.node_id = 6
-        AND c.check_result = 1
-        AND t.score_package_id = #{pkgId}
-        <if test="ignoreIds != null and ignoreIds.size > 0">
-            AND t.id NOT IN
-            <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-    </select>
-
-    <select id="listAvailableTaskForSupervision1" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task t
-        LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
-        WHERE c.node_id = 6
-        AND c.check_result = 1
-        <if test="pkgIds != null and pkgIds.size > 0">
-            AND t.score_package_id IN
-            <foreach collection="pkgIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="ignoreIds != null and ignoreIds.size > 0">
-            AND t.id NOT IN
-            <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-    </select>
-
-    <select id="listAvailableTaskForSupervision2" resultMap="wmTaskMap">
-        SELECT *
-        FROM wm_task t
-        LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
-        WHERE c.node_id = 6
-        AND c.check_result = 1
-        <if test="pkgIds != null and pkgIds.size > 0">
-            AND t.score_package_id IN
-            <foreach collection="pkgIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="ignoreIds != null and ignoreIds.size > 0">
-            AND t.id NOT IN
-            <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-    </select>
+      AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP}
+      AND #{endTime,jdbcType=TIMESTAMP})
+  </select>
+
+  <select id="newGetUserTaskSubScore" resultType="java.lang.Integer">
+    SELECT ifnull(SUM(t.score), 0)
+    FROM wm_task t,
+         wm_score_package p
+    WHERE t.score_package_id = p.id
+      AND p.package_type1 = '1'
+      AND t.real_flag = '0'
+      AND t.task_status = '3'
+      AND t.task_user_id = #{userId,jdbcType=VARCHAR}
+      AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP})
+  </select>
+
+  <!-- 患者教育-处方列表-分页 -->
+  <select id="listTaskPrescriptionPage" resultMap="wmTaskWithContentMap">
+    SELECT
+    *
+    FROM
+    wm_task t
+    LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+    <where>
+      t.del_flag = 0
+      AND t.real_flag = 0
+      AND task_status = 3
+      AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
+      <if test="prescriptionNo != null and prescriptionNo != ''">
+        AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
+      </if>
+    </where>
+  </select>
+
+  <!-- 患者教育-处方列表 -->
+  <select id="listTaskPrescription" resultMap="wmTaskWithContentMap">
+    SELECT
+    *
+    FROM
+    wm_task t
+    LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+    <where>
+      t.del_flag = 0
+      AND t.real_flag = 0
+      AND task_status = 3
+      AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
+      <if test="prescriptionNo != null and prescriptionNo != ''">
+        AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
+      </if>
+    </where>
+  </select>
+
+  <!-- 查询调查信息审核列表 -->
+  <select id="listInfoAudit" resultMap="wmTaskMap">
+    SELECT
+    temp.*, u.realname AS task_user_name, u.username
+    FROM
+    (
+    SELECT max(id) AS id, max(task_user_id) AS task_user_id, max(create_time) AS create_time,
+    max(approval_info) AS approval_info, max(plat_audit_status) AS plat_audit_status,
+    max(task_status) AS task_status, task_content_id, task_type_id
+    FROM wm_task
+    <where>
+      del_flag = '0' AND enable_flag = '0' AND (task_type_id IN ('15', '16', '18', '30') AND task_from != '2')
+      <if test="query.taskTypeId != null and query.taskTypeId != ''">
+        AND task_type_id = #{query.taskTypeId, jdbcType=VARCHAR}
+      </if>
+      <if test="query.platAuditStatus != null and query.platAuditStatus != ''">
+        AND plat_audit_status = #{query.platAuditStatus, jdbcType=VARCHAR}
+      </if>
+      <if test="startDate != null and endDate != null">
+        AND create_time BETWEEN #{startDate, jdbcType=TIMESTAMP} AND #{endDate, jdbcType=TIMESTAMP}
+      </if>
+    </where>
+    GROUP BY task_content_id, task_type_id
+    ) temp
+    LEFT JOIN sys_user u ON u.user_id = temp.task_user_id
+    ORDER BY temp.create_time DESC
+  </select>
+
+  <!-- 查询同一家医院一个月做的任务 -->
+  <select id="listCurrentMonthHospitalTask" resultMap="wmTaskMap">
+    SELECT t.*
+    FROM wm_task t
+           LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+    WHERE t.task_status IN (1, 2, 3)
+      AND t.enable_flag = 0
+      AND t.del_flag = 0
+      AND YEAR (
+      t.create_time) = YEAR (CURDATE())
+      AND MONTH (t.create_time) = MONTH (CURDATE())
+      AND tc.temp29 = #{hospitalId}
+  </select>
+
+  <!-- 查询非审核不通过的会议任务个数 -->
+  <select id="countMeetingTask" resultType="java.lang.Long">
+    SELECT COUNT(*)
+    FROM wm_task
+    LEFT JOIN wm_task_content ON wm_task.task_content_id = wm_task_content.id
+    WHERE wm_task.task_type_id IN
+    <foreach collection="taskTypeList" item="item" index="index" separator="," open="(" close=")">
+      #{item}
+    </foreach>
+    AND wm_task.task_user_id = #{taskUserId}
+    AND wm_task_content.temp4 BETWEEN #{startTime} AND #{endTime}
+    AND wm_task.task_status != 4
+  </select>
+
+  <!-- 企业审核查询任务列表 -->
+  <select id="entTaskPageByTaskType" resultType="com.qunzhixinxi.hnqz.admin.api.vo.WmTaskVO">
+    select t.*, p.typeid, p.score_package_name
+    from wm_task t
+    left join wm_score_package p on p.id = t.score_package_id
+    where t.task_type_id in
+    <foreach collection="query.taskTypeIdList" item="item" index="index" separator="," open="(" close=")">
+      #{item}
+    </foreach>
+    and (
+    t.report_one_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
+    or
+    t.report_second_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
+    or
+    t.report_drug_id in (select id from wm_report r where r.drug_ent_id=#{query.drugEntId})
+    )
+    <if test="query.approvedStatus != null and query.waitFlag == false">
+      and (
+      <if test="query.deptLevel == 2">
+        t.report_drug_approval_opinion in
+      </if>
+      <if test="query.deptLevel != 2">
+        t.report_one_approval_opinion in
+      </if>
+      <foreach collection="query.entTaskStatus" item="item" index="index" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+      )
+    </if>
+    <if test="query.approvedStatus == null and query.waitFlag == true">
+      and (
+      <if test="query.deptLevel == 2">
+        t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0
+      </if>
+      <if test="query.deptLevel != 2">
+        t.report_one_approval_opinion is null and t.report_one_approval_status = 0
+      </if>
+      )
+    </if>
+    <if test="query.approvedStatus == 1 and query.waitFlag == true">
+      and (
+      <if test="query.deptLevel == 2">
+        (t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0)
+        or t.report_drug_approval_opinion != '2'
+      </if>
+      <if test="query.deptLevel != 2">
+        (t.report_one_approval_opinion is null and t.report_one_approval_status = 0)
+        or t.report_one_approval_opinion != '2'
+      </if>
+      )
+    </if>
+    <if test="query.approvedStatus == 2 and query.waitFlag == true">
+      and (
+      <if test="query.deptLevel == 2">
+        (t.report_drug_approval_opinion is null and t.report_drug_approval_status = 0)
+        or t.report_drug_approval_opinion != '1'
+      </if>
+      <if test="query.deptLevel != 2">
+        (t.report_one_approval_opinion is null and t.report_one_approval_status = 0)
+        or t.report_one_approval_opinion != '1'
+      </if>
+      )
+    </if>
+
+  </select>
+
+  <select id="listAvailableTaskForSupervision" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task t
+    LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
+    WHERE c.node_id = 6
+    AND c.check_result = 1
+    AND t.score_package_id = #{pkgId}
+    <if test="ignoreIds != null and ignoreIds.size > 0">
+      AND t.id NOT IN
+      <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+  </select>
+
+  <select id="listAvailableTaskForSupervision1" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task t
+    LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
+    WHERE c.node_id = 6
+    AND c.check_result = 1
+    <if test="pkgIds != null and pkgIds.size > 0">
+      AND t.score_package_id IN
+      <foreach collection="pkgIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+    <if test="ignoreIds != null and ignoreIds.size > 0">
+      AND t.id NOT IN
+      <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+  </select>
+
+  <select id="listAvailableTaskForSupervision2" resultMap="wmTaskMap">
+    SELECT *
+    FROM wm_task t
+    LEFT JOIN sys_chain_node_check_his c ON c.target_id = t.id
+    WHERE c.node_id = 6
+    AND c.check_result = 1
+    <if test="pkgIds != null and pkgIds.size > 0">
+      AND t.score_package_id IN
+      <foreach collection="pkgIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+    <if test="userIds != null and userIds.size > 0">
+      AND t.task_user_id IN
+      <foreach collection="userIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+    <if test="taskId != '' and taskId != null">
+      and t.id LIKE CONCAT('%',#{taskId},'%')
+    </if>
+    <if test="taskTypeId != '' and taskTypeId != null">
+      and t.task_type_id LIKE CONCAT('%',#{taskTypeId},'%')
+    </if>
+    <if test="taskNumber != '' and taskNumber != null">
+      and t.task_number LIKE CONCAT('%',#{taskNumber},'%')
+    </if>
+    <if test="ignoreIds != null and ignoreIds.size > 0">
+      AND t.id NOT IN
+      <foreach collection="ignoreIds" item="id" open="(" separator="," close=")">
+        #{id}
+      </foreach>
+    </if>
+  </select>
 </mapper>

pom.xml

@@ -1,336 +1,340 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.qunzhixinxi</groupId>
-	<artifactId>hnqz</artifactId>
-	<version>3.9.0</version>
-	<name>${project.artifactId}</name>
-	<packaging>pom</packaging>
+  <groupId>com.qunzhixinxi</groupId>
+  <artifactId>hnqz</artifactId>
+  <version>3.9.0</version>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
 
-	<properties>
-		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-		<spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-		<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.version>3.8.1</maven.compiler.version>
-		<spring.checkstyle.version>0.0.22</spring.checkstyle.version>
-		<git.commit.version>2.2.5</git.commit.version>
-		<spring-boot-admin.version>2.2.3</spring-boot-admin.version>
-		<hutool.version>5.7.7</hutool.version>
-		<kaptcha.version>1.2.0</kaptcha.version>
-		<velocity.version>1.7</velocity.version>
-		<lcn.version>4.1.0</lcn.version>
-		<jasypt.version>2.1.1</jasypt.version>
-		<ttl.version>2.11.4</ttl.version>
-		<aws.version>1.11.543</aws.version>
-		<xxl.job.version>2.2.0</xxl.job.version>
-		<activiti.version>5.22.0</activiti.version>
-		<docker.registry>172.17.0.111</docker.registry>
-		<docker.host>http://172.17.0.111:2375</docker.host>
-		<docker.namespace>library</docker.namespace>
-		<docker.username>admin</docker.username>
-		<docker.password>Harbor12345</docker.password>
-		<docker.plugin.version>0.32.0</docker.plugin.version>
-		<!--  默认忽略docker构建 -->
-		<docker.skip>true</docker.skip>
-	</properties>
+  <properties>
+    <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+    <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+    <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.version>3.8.1</maven.compiler.version>
+    <spring.checkstyle.version>0.0.22</spring.checkstyle.version>
+    <git.commit.version>2.2.5</git.commit.version>
+    <spring-boot-admin.version>2.2.3</spring-boot-admin.version>
+    <hutool.version>5.7.7</hutool.version>
+    <kaptcha.version>1.2.0</kaptcha.version>
+    <velocity.version>1.7</velocity.version>
+    <lcn.version>4.1.0</lcn.version>
+    <jasypt.version>2.1.1</jasypt.version>
+    <ttl.version>2.11.4</ttl.version>
+    <aws.version>1.11.543</aws.version>
+    <xxl.job.version>2.2.0</xxl.job.version>
+    <activiti.version>5.22.0</activiti.version>
+    <docker.registry>172.17.0.111</docker.registry>
+    <docker.host>http://172.17.0.111:2375</docker.host>
+    <docker.namespace>library</docker.namespace>
+    <docker.username>admin</docker.username>
+    <docker.password>Harbor12345</docker.password>
+    <docker.plugin.version>0.32.0</docker.plugin.version>
+    <!--  默认忽略docker构建 -->
+    <docker.skip>true</docker.skip>
+  </properties>
 
-	<dependencies>
-		<!--配置文件处理器-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!--jasypt配置文件加解密-->
-		<dependency>
-			<groupId>com.github.ulisesbocchio</groupId>
-			<artifactId>jasypt-spring-boot-starter</artifactId>
-			<version>${jasypt.version}</version>
-		</dependency>
-		<!--监控-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<!--监控客户端-->
-		<dependency>
-			<groupId>de.codecentric</groupId>
-			<artifactId>spring-boot-admin-starter-client</artifactId>
-			<version>${spring-boot-admin.version}</version>
-		</dependency>
-		<!--Lombok-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!--测试依赖-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <!--配置文件处理器-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <!--jasypt配置文件加解密-->
+    <dependency>
+      <groupId>com.github.ulisesbocchio</groupId>
+      <artifactId>jasypt-spring-boot-starter</artifactId>
+      <version>${jasypt.version}</version>
+    </dependency>
+    <!--监控-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    <!--监控客户端-->
+    <dependency>
+      <groupId>de.codecentric</groupId>
+      <artifactId>spring-boot-admin-starter-client</artifactId>
+      <version>${spring-boot-admin.version}</version>
+    </dependency>
+    <!--Lombok-->
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!--测试依赖-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-	<modules>
-		<module>hnqz-gateway</module>
-		<module>hnqz-auth</module>
-		<module>hnqz-upms</module>
-		<module>hnqz-common</module>
-		<module>hnqz-visual</module>
-    </modules>
+  <modules>
+    <module>hnqz-gateway</module>
+    <module>hnqz-auth</module>
+    <module>hnqz-upms</module>
+    <module>hnqz-common</module>
+    <module>hnqz-visual</module>
+  </modules>
 
-	<dependencyManagement>
-		<dependencies>
-			<!--hnqz 公共版本定义-->
-			<dependency>
-				<groupId>com.qunzhixinxi</groupId>
-				<artifactId>hnqz-common-bom</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!--spring boot 公共版本定义-->
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring-boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!--spring cloud 公共版本定义-->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!--spring cloud alibaba-->
-			<dependency>
-				<groupId>com.alibaba.cloud</groupId>
-				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>${spring-cloud-alibaba.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!--web 模块-->
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-web</artifactId>
-				<version>${spring-boot.version}</version>
-				<exclusions>
-					<!--排除tomcat依赖-->
-					<exclusion>
-						<artifactId>spring-boot-starter-tomcat</artifactId>
-						<groupId>org.springframework.boot</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <!--hnqz 公共版本定义-->
+      <dependency>
+        <groupId>com.qunzhixinxi</groupId>
+        <artifactId>hnqz-common-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!--spring boot 公共版本定义-->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!--spring cloud 公共版本定义-->
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-dependencies</artifactId>
+        <version>${spring-cloud.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!--spring cloud alibaba-->
+      <dependency>
+        <groupId>com.alibaba.cloud</groupId>
+        <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+        <version>${spring-cloud-alibaba.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!--web 模块-->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-web</artifactId>
+        <version>${spring-boot.version}</version>
+        <!--<exclusions>-->
+        <!--	&lt;!&ndash;排除tomcat依赖&ndash;&gt;-->
+        <!--	<exclusion>-->
+        <!--		<artifactId>spring-boot-starter-tomcat</artifactId>-->
+        <!--		<groupId>org.springframework.boot</groupId>-->
+        <!--	</exclusion>-->
+        <!--</exclusions>-->
+      </dependency>
+      <dependency>
+        <artifactId>spring-boot-starter-tomcat</artifactId>
+        <groupId>org.springframework.boot</groupId>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-	<build>
-		<finalName>${project.name}</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<pluginManagement>
-			<plugins>
-				<!--spring boot 默认插件-->
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>${spring-boot.version}</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>repackage</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<!--maven  docker 打包插件 -->
-				<plugin>
-					<groupId>io.fabric8</groupId>
-					<artifactId>docker-maven-plugin</artifactId>
-					<version>${docker.plugin.version}</version>
-					<configuration>
-						<dockerHost>${docker.host}</dockerHost>
-						<registry>${docker.registry}</registry>
-						<authConfig>
-							<push>
-								<username>${docker.username}</username>
-								<password>${docker.password}</password>
-							</push>
-						</authConfig>
-						<images>
-							<image>
-								<name>${docker.registry}/${docker.namespace}/${project.name}:${project.version}</name>
-								<build>
-									<dockerFile>${project.basedir}/Dockerfile</dockerFile>
-								</build>
-							</image>
-						</images>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<!--代码格式插件，默认使用spring 规则-->
-			<plugin>
-				<groupId>io.spring.javaformat</groupId>
-				<artifactId>spring-javaformat-maven-plugin</artifactId>
-				<version>${spring.checkstyle.version}</version>
-			</plugin>
-			<!--代码编译指定版本插件-->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven.compiler.version}</version>
-				<configuration>
-					<target>${maven.compiler.target}</target>
-					<source>${maven.compiler.source}</source>
-					<encoding>UTF-8</encoding>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<!--打包关联最新 git commit 信息插件-->
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>${git.commit.version}</version>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <finalName>${project.name}</finalName>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <pluginManagement>
+      <plugins>
+        <!--spring boot 默认插件-->
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring-boot.version}</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>repackage</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!--maven  docker 打包插件 -->
+        <plugin>
+          <groupId>io.fabric8</groupId>
+          <artifactId>docker-maven-plugin</artifactId>
+          <version>${docker.plugin.version}</version>
+          <configuration>
+            <dockerHost>${docker.host}</dockerHost>
+            <registry>${docker.registry}</registry>
+            <authConfig>
+              <push>
+                <username>${docker.username}</username>
+                <password>${docker.password}</password>
+              </push>
+            </authConfig>
+            <images>
+              <image>
+                <name>${docker.registry}/${docker.namespace}/${project.name}:${project.version}</name>
+                <build>
+                  <dockerFile>${project.basedir}/Dockerfile</dockerFile>
+                </build>
+              </image>
+            </images>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!--代码格式插件，默认使用spring 规则-->
+      <plugin>
+        <groupId>io.spring.javaformat</groupId>
+        <artifactId>spring-javaformat-maven-plugin</artifactId>
+        <version>${spring.checkstyle.version}</version>
+      </plugin>
+      <!--代码编译指定版本插件-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.version}</version>
+        <configuration>
+          <target>${maven.compiler.target}</target>
+          <source>${maven.compiler.source}</source>
+          <encoding>UTF-8</encoding>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <!--打包关联最新 git commit 信息插件-->
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>${git.commit.version}</version>
+      </plugin>
+    </plugins>
+  </build>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>aliyun-plugin</id>
-			<url>https://maven.aliyun.com/repository/public</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>aliyun-plugin</id>
+      <url>https://maven.aliyun.com/repository/public</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
 
-	<repositories>
-		<!--阿里云代理-->
-		<repository>
-			<id>aliyun</id>
-			<name>aliyun</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
-		</repository>
-	</repositories>
+  <repositories>
+    <!--阿里云代理-->
+    <repository>
+      <id>aliyun</id>
+      <name>aliyun</name>
+      <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+    </repository>
+  </repositories>
 
 
-	<profiles>
-		<profile>
-			<id>dev</id>
-			<properties>
-				<!-- 环境标识，需要与配置文件的名称相对应 -->
-				<profiles.active>dev</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>TGCzv6Rg2qimAJn</nacos.password>
-				<nacos.server-addr>localhost:8848</nacos.server-addr>
-				<profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
-				<profiles.auth.port>3000</profiles.auth.port>
-				<profiles.gateway.port>9998</profiles.gateway.port>
-				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
-				<profiles.quartz.port>5007</profiles.quartz.port>
-				<profiles.report.port>3001</profiles.report.port>
-			</properties>
-			<activation>
-				<!-- 默认环境 -->
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-		<profile>
-			<id>demo</id>
-			<properties>
-				<profiles.active>demo</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>TGCzv6Rg2qimAJn</nacos.password>
-				<nacos.server-addr>localhost:8848</nacos.server-addr>
-				<profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
-				<profiles.auth.port>23000</profiles.auth.port>
-				<profiles.gateway.port>29999</profiles.gateway.port>
-				<profiles.upms.biz.port>24000</profiles.upms.biz.port>
-				<profiles.quartz.port>25007</profiles.quartz.port>
-				<profiles.report.port>23001</profiles.report.port>
-			</properties>
-		</profile>
-		<profile>
-			<id>pre</id>
-			<properties>
-				<profiles.active>pre</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>TGCzv6Rg2qimAJn</nacos.password>
-				<nacos.server-addr>localhost:8848</nacos.server-addr>
-				<profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
-				<profiles.auth.port>13000</profiles.auth.port>
-				<profiles.gateway.port>19998</profiles.gateway.port>
-				<profiles.upms.biz.port>14000</profiles.upms.biz.port>
-				<profiles.quartz.port>15007</profiles.quartz.port>
-				<profiles.report.port>13001</profiles.report.port>
-			</properties>
-		</profile>
-		<profile>
-			<id>prod</id>
-			<properties>
-				<profiles.active>prod</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>TGCzv6Rg2qimAJn1</nacos.password>
-				<nacos.server-addr>172.25.196.30:8848</nacos.server-addr>
-				<profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
-				<profiles.auth.port>3000</profiles.auth.port>
-				<profiles.gateway.port>9999</profiles.gateway.port>
-				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
-				<profiles.quartz.port>5007</profiles.quartz.port>
-				<profiles.report.port>3001</profiles.report.port>
-			</properties>
-		</profile>
-		<profile>
-			<id>local</id>
-			<properties>
-				<profiles.active>local</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>nacos</nacos.password>
-				<nacos.server-addr>localhost:8848</nacos.server-addr>
-				<profiles.namespace>9bdeb532-930a-4d8a-9af1-206f64767268</profiles.namespace>
-				<profiles.auth.port>3000</profiles.auth.port>
-				<profiles.gateway.port>9999</profiles.gateway.port>
-				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
-				<profiles.quartz.port>5007</profiles.quartz.port>
-				<profiles.report.port>3001</profiles.report.port>
-			</properties>
-		</profile>
-		<profile>
-			<id>remote</id>
-			<properties>
-				<!-- 环境标识，需要与配置文件的名称相对应 -->
-				<profiles.active>remote</profiles.active>
-				<nacos.username>nacos</nacos.username>
-				<nacos.password>nacos1</nacos.password>
-				<nacos.server-addr>nacos.freerr.cn:57260</nacos.server-addr>
-				<profiles.namespace>51f03f27-1bcc-4720-bfab-83cffa17807c</profiles.namespace>
-				<profiles.auth.port>3000</profiles.auth.port>
-				<profiles.gateway.port>9999</profiles.gateway.port>
-				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
-				<profiles.quartz.port>5007</profiles.quartz.port>
-				<profiles.report.port>3001</profiles.report.port>
-			</properties>
-		</profile>
-	</profiles>
+  <profiles>
+    <profile>
+      <id>dev</id>
+      <properties>
+        <!-- 环境标识，需要与配置文件的名称相对应 -->
+        <profiles.active>dev</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>TGCzv6Rg2qimAJn</nacos.password>
+        <nacos.server-addr>localhost:8848</nacos.server-addr>
+        <profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
+        <profiles.auth.port>3000</profiles.auth.port>
+        <profiles.gateway.port>9998</profiles.gateway.port>
+        <profiles.upms.biz.port>4000</profiles.upms.biz.port>
+        <profiles.quartz.port>5007</profiles.quartz.port>
+        <profiles.report.port>3001</profiles.report.port>
+      </properties>
+      <activation>
+        <!-- 默认环境 -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+    <profile>
+      <id>demo</id>
+      <properties>
+        <profiles.active>demo</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>TGCzv6Rg2qimAJn</nacos.password>
+        <nacos.server-addr>localhost:8848</nacos.server-addr>
+        <profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
+        <profiles.auth.port>23000</profiles.auth.port>
+        <profiles.gateway.port>29999</profiles.gateway.port>
+        <profiles.upms.biz.port>24000</profiles.upms.biz.port>
+        <profiles.quartz.port>25007</profiles.quartz.port>
+        <profiles.report.port>23001</profiles.report.port>
+      </properties>
+    </profile>
+    <profile>
+      <id>pre</id>
+      <properties>
+        <profiles.active>pre</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>TGCzv6Rg2qimAJn</nacos.password>
+        <nacos.server-addr>localhost:8848</nacos.server-addr>
+        <profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
+        <profiles.auth.port>13000</profiles.auth.port>
+        <profiles.gateway.port>19998</profiles.gateway.port>
+        <profiles.upms.biz.port>14000</profiles.upms.biz.port>
+        <profiles.quartz.port>15007</profiles.quartz.port>
+        <profiles.report.port>13001</profiles.report.port>
+      </properties>
+    </profile>
+    <profile>
+      <id>prod</id>
+      <properties>
+        <profiles.active>prod</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>TGCzv6Rg2qimAJn1</nacos.password>
+        <nacos.server-addr>172.25.196.30:8848</nacos.server-addr>
+        <profiles.namespace>a5e42a72-1f8f-44fc-bd2d-2dbc73cb327c</profiles.namespace>
+        <profiles.auth.port>3000</profiles.auth.port>
+        <profiles.gateway.port>9999</profiles.gateway.port>
+        <profiles.upms.biz.port>4000</profiles.upms.biz.port>
+        <profiles.quartz.port>5007</profiles.quartz.port>
+        <profiles.report.port>3001</profiles.report.port>
+      </properties>
+    </profile>
+    <profile>
+      <id>local</id>
+      <properties>
+        <profiles.active>local</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>nacos</nacos.password>
+        <nacos.server-addr>localhost:8848</nacos.server-addr>
+        <profiles.namespace>9bdeb532-930a-4d8a-9af1-206f64767268</profiles.namespace>
+        <profiles.auth.port>3000</profiles.auth.port>
+        <profiles.gateway.port>9999</profiles.gateway.port>
+        <profiles.upms.biz.port>4000</profiles.upms.biz.port>
+        <profiles.quartz.port>5007</profiles.quartz.port>
+        <profiles.report.port>3001</profiles.report.port>
+      </properties>
+    </profile>
+    <profile>
+      <id>remote</id>
+      <properties>
+        <!-- 环境标识，需要与配置文件的名称相对应 -->
+        <profiles.active>remote</profiles.active>
+        <nacos.username>nacos</nacos.username>
+        <nacos.password>nacos1</nacos.password>
+        <nacos.server-addr>nacos.freerr.cn:57260</nacos.server-addr>
+        <profiles.namespace>51f03f27-1bcc-4720-bfab-83cffa17807c</profiles.namespace>
+        <profiles.auth.port>3000</profiles.auth.port>
+        <profiles.gateway.port>9999</profiles.gateway.port>
+        <profiles.upms.biz.port>4000</profiles.upms.biz.port>
+        <profiles.quartz.port>5007</profiles.quartz.port>
+        <profiles.report.port>3001</profiles.report.port>
+      </properties>
+    </profile>
+  </profiles>
 </project>