列表统计

ruoyi-system/src/main/java/com/ruoyi/system/domain/ProposalInfo.java

@@ -132,7 +132,7 @@ public class ProposalInfo extends BaseEntity
     private String cbdwdfwy;
 
     /** 委员满意程度（0：不满意，1：一般，2：满意，3：非常满意） */
-    @Excel(name = "委员满意程度", readConverterExp = "0=：不满意，1：一般，2：满意，3：非常满意")
+    @Excel(name = "委员满意程度", readConverterExp = "0=不满意,1=基本满意,2=满意")
     private String satisfaction;
 
     /** 委员意见 */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProposalInfoServiceImpl.java

@@ -161,7 +161,7 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
         int yjb = 0;
 
         for (ProposalInfo info : proposalInfos) {
-            if(!"1".equals(info.getProposalProgress()) && !"3".equals(info.getProposalProgress()) && !"8".equals(info.getProposalProgress())){
+            if(!"3".equals(info.getProposalProgress()) && !"8".equals(info.getProposalProgress())){
                 blz++;
             }
             if(StringUtils.isNotEmpty(info.getSatisfaction()) && "0".equals(info.getSatisfaction())){

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SqmyInfoServiceImpl.java

@@ -139,47 +139,35 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
         Map<String,Object> map = new HashMap<>();
         List<SqmyInfo> sqmyInfos = sqmyInfoMapper.selectSqmyInfoList(sqmyInfo);
         int totle = sqmyInfos.size();
-        //待审核
-        int dsh = 0;
-        //已审核
-        int ysh = 0;
+        //已读
+        int yd = 0;
+        //未读
+        int wd = 0;
+        //已采用
+        int ycy = 0;
+        //未采用
+        int wcy = 0;
         for (SqmyInfo info : sqmyInfos) {
-            if("1".equals(info.getSqmyProgress())){
-                dsh++;
-            }else {
-                ysh++;
+            if(StringUtils.isNotEmpty(info.getIsRead()) && "0".equals(info.getIsRead())){
+                yd++;
             }
-        }
-        //待交办
-        int djb = 0;
-        //以交办
-        int yjb = 0;
-        //已办结
-        int ybj = 0;
-        //未办结
-        int wbj = 0;
-        for (SqmyInfo info : sqmyInfos) {
-            if(StringUtils.isNotEmpty(info.getSatisfaction()) && Integer.parseInt(info.getSatisfaction())>4){
-                yjb++;
+            if(StringUtils.isNotEmpty(info.getIsRead()) && "1".equals(info.getIsRead())){
+                wd++;
             }
-            if(StringUtils.isNotEmpty(info.getSatisfaction()) && Integer.parseInt(info.getSatisfaction())<=4){
-                djb++;
+            if("2".equals(info.getSqmyProgress())) {
+                ycy++;
             }
-            if("8".equals(info.getSqmyProgress())) {
-                ybj++;
-            }
-            if(!"8".equals(info.getSqmyProgress())) {
-                wbj++;
+            if(!"3".equals(info.getSqmyProgress())) {
+                wcy++;
             }
         }
         map.put("totle",totle);
-        map.put("dsh",dsh);
-        map.put("ysh",ysh);
 
-        map.put("djb",djb);
-        map.put("djb",djb);
-        map.put("ybj",ybj);
-        map.put("wbj",wbj);
+
+        map.put("yd",yd);
+        map.put("wd",wd);
+        map.put("ycy",ycy);
+        map.put("wcy",wcy);
 
         return AjaxResult.success(map);
     }