小程序 -------- 待处理总数提示

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java

@@ -33,7 +33,7 @@ public class ItemExamineWorkListFormDTO implements Serializable {
 
 
     /**
-     * 是否超时
+     * 部门ID
      */
     private Long deptId;
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -1736,10 +1736,70 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Override
     public Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto) {
 
+        // 之前的逻辑：暂时保留不变动
         ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto);
+
+        // 待处理总数提示（20220926完善）
+        resultDTO.setPendingHandleNum(getDealIteamNum());
+
         return new Result<ItemStatisticsResultDTO>().ok(resultDTO);
     }
 
+    /**
+     * 获取工作端待处理数量
+     * @return
+     */
+    public Integer getDealIteamNum(){
+        ItemWorkListFormDTO formDTO = new ItemWorkListFormDTO();
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RuntimeException("获取用户信息失败");
+        }
+        if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
+            if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
+                Result<SysDeptDTO> resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(formDTO.getStreetId()));
+                SysDeptDTO dept = resultdept.getData();
+                String deptId = formDTO.getStreetId();
+                if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) {
+                    formDTO.setDistrictDeptId(deptId);
+                    formDTO.setStreetId("");
+                }
+            }
+        }
+        //部门ID列表
+        List<Long> deptIdList = new ArrayList<>();
+        // 判断是否为社区网格，不为社区网格只能查看本部门下的项目数据
+        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) {
+            deptIdList = user.getDeptIdList();
+        } else {
+            deptIdList.add(user.getDeptId());
+        }
+        if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){
+            formDTO.setIsRemind("isRemind");
+        }
+        formDTO.setDeptIdList(null);
+        if (null != deptIdList && deptIdList.size() > 0) {
+            formDTO.setDeptIdList(deptIdList);
+        }
+        if (null != formDTO.getItemCode()) {
+            formDTO.setItemCode(formDTO.getItemCode().trim());
+        }
+
+        if(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())){
+            formDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY);
+        }
+
+        formDTO.setPageIndex(0);
+        formDTO.setPageSize(99999);
+
+        // 待处理
+        formDTO.setItemState("0");
+
+        List<ItemPendingHandleDTO> list = baseDao.listEqPc(formDTO);
+
+        return list.size();
+    }
+
 
     @Override
     public List<KpiEvaluationAmountResultDTO> statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -1354,27 +1354,26 @@
 	        closingTable.closingCaseNum,
             closedTable.closedNum,
             noticeTable.noticeNum
-        FROM
-	           (
-           SELECT
-	           'ITEM_COUNT' AS keystr,
-	           COUNT( * ) AS pendingHandleNum
-           FROM
-	           epdc_item item
-	           LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID
-	           AND dept.DEL_FLAG = '0'
-           WHERE
-	           item.DEL_FLAG = '0'
-	           AND item.ITEM_STATE = '0'
-               AND dept.DEPT_ID IN
-        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
-            #{deptIdItem}
-        </foreach>
-        <if test='deptId != null and deptId != ""'>
-            AND dept.DEPT_ID = #{deptId}
-        </if>
+        FROM (
+                       SELECT
+                           'ITEM_COUNT' AS keystr,
+                           COUNT( * ) AS pendingHandleNum
+                       FROM
+                           epdc_item item
+                           LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID
+                           AND dept.DEL_FLAG = '0'
+                       WHERE
+                           item.DEL_FLAG = '0'
+                           AND item.ITEM_STATE = '0'
+                           AND dept.DEPT_ID IN
+                    <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                        #{deptIdItem}
+                    </foreach>
+                    <if test='deptId != null and deptId != ""'>
+                        AND dept.DEPT_ID = #{deptId}
+                    </if>
 
-	           ) pendingTable
+	    ) pendingTable
 	    INNER JOIN (
            SELECT
 	           'ITEM_COUNT' AS keystr,