社情民意修改

ruoyi-system/src/main/java/com/ruoyi/system/domain/sqmy/SqmyInfo.java

@@ -78,6 +78,12 @@ public class SqmyInfo extends BaseEntity
     @Excel(name = "是否立案", readConverterExp = "0=是,1=否")
     private String isRecord;
 
+    /**
+     * 状态（0：已读，1：未读）
+     */
+    @Excel(name = "状态", readConverterExp = "0=已读,1=未读")
+    private String isRead;
+
     /** 社情民意进度(0：提交提案，1：提案审查，2：提案立案，3:提案不立案，4：提案交办，5：提案办理，6：提案审核，7：审核不通过，8：已办结） */
     @Excel(name = "社情民意进度(0：提交提案，1：提案审查，2：提案立案，3:提案不立案，4：提案交办，5：提案办理，6：提案审核，7：审核不通过，8：已办结）")
     private String sqmyProgress;
@@ -155,6 +161,13 @@ public class SqmyInfo extends BaseEntity
     private String endTime;
     private String startTime;
 
+    public String getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(String isRead) {
+        this.isRead = isRead;
+    }
 
     public List<ZxFj> getDfFjList() {
         return dfFjList;

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.ProposalInfo;
 import com.ruoyi.system.domain.ProposalUnitReply;
 import com.ruoyi.system.domain.ZxFj;
+import com.ruoyi.system.domain.member.MemberInfo;
 import com.ruoyi.system.domain.sqmy.SqmyInfo;
 import com.ruoyi.system.domain.sqmy.SqmyUnitReply;
 import com.ruoyi.system.mapper.SqmyUnitReplyMapper;
@@ -48,6 +49,23 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
     @Override
     public SqmyInfo selectSqmyInfoBySqmyId(Long sqmyId)
     {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<SysRole> rols = user.getRoles();
+        boolean bl = false;
+        for (SysRole rol : rols) {
+            if("sqmy".equals(rol.getRoleKey()) || "gly".equals(rol.getRoleKey()) ){
+                bl = true;
+                break;
+            }
+        }
+        if(bl){
+            SqmyInfo info = new SqmyInfo();
+            info.setIsRead("0");
+            info.setSqmyId(sqmyId);
+            sqmyInfoMapper.updateSqmyInfo(info);
+        }
+
         SqmyInfo sqmyInfo = sqmyInfoMapper.selectSqmyInfoBySqmyId(sqmyId);
         //查询附件
         ZxFj zxFj = new ZxFj();
@@ -61,15 +79,17 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
                 if("4".equals(fj.getStytle())){
                     fjList.add(fj);
                 }
-                if("5".equals(fj.getStytle())){
+                if("6".equals(fj.getStytle())){
                     dfwyFjList.add(fj);
                 }
             }
             sqmyInfo.setZxFjList(fjList);
             sqmyInfo.setDfFjList(dfwyFjList);
         }
+        //答复附件
+
         //查询答复
-        SqmyUnitReply sqmyUnitReply = new SqmyUnitReply();
+        /*SqmyUnitReply sqmyUnitReply = new SqmyUnitReply();
         sqmyUnitReply.setSqmyId(sqmyId);
         List<SqmyUnitReply> sqmyUnitReplyList = sqmyUnitReplyMapper.selectSqmyUnitReplyList(sqmyUnitReply);
         if(sqmyUnitReplyList!=null && sqmyUnitReplyList.size()>0){
@@ -86,7 +106,7 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
                 unitReply.setZxFjList(dfFjList);
             }
             sqmyInfo.setSqmyUnitReplyList(sqmyUnitReplyList);
-        }
+        }*/
 
         return sqmyInfo;
     }
@@ -267,15 +287,16 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
     @Override
     public AjaxResult isRecord(SqmyInfo sqmyInfo) {
         //不立案，指定答复单位
+        sqmyInfo.setIsRead("0");
         if("1".equals(sqmyInfo.getIsRecord())){
             sqmyInfo.setSqmyProgress("3");
-            List<SqmyUnitReply> sqmyUnitReplyList = sqmyInfo.getSqmyUnitReplyList();
+            /*List<SqmyUnitReply> sqmyUnitReplyList = sqmyInfo.getSqmyUnitReplyList();
             for (SqmyUnitReply sqmyUnitReply : sqmyUnitReplyList) {
                 sqmyUnitReply.setSqmyId(sqmyInfo.getSqmyId());
                 sqmyUnitReply.setType("1");
                 sqmyUnitReply.setStartTime(DateUtils.getNowDate());
                 sqmyUnitReplyMapper.insertSqmyUnitReply(sqmyUnitReply);
-            }
+            }*/
         }else{
             sqmyInfo.setSqmyProgress("2");
         }
@@ -324,6 +345,15 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
     @Override
     public AjaxResult zxIdea(SqmyInfo sqmyInfo) {
         sqmyInfo.setUpdateTime(DateUtils.getNowDate());
+        if(sqmyInfo.getZxFjList()!=null && sqmyInfo.getZxFjList().size()>0){
+            for (ZxFj zxFj : sqmyInfo.getZxFjList()) {
+                zxFj.setMainId(sqmyInfo.getSqmyId());
+                zxFj.setSourceId(sqmyInfo.getSqmyId());
+                zxFj.setType("2");
+                zxFj.setStytle("6");
+                zxFjMapper.insertZxFj(zxFj);
+            }
+        }
         int i = sqmyInfoMapper.updateSqmyInfo(sqmyInfo);
         return i > 0 ? AjaxResult.success() : AjaxResult.error();
     }