Merge remote-tracking branch 'origin/master'

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

@@ -26,6 +26,8 @@ import com.ruoyi.system.domain.ProposalInfo;
 import com.ruoyi.system.service.IProposalInfoService;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.ruoyi.common.constant.CommonConstants.*;
+
 /**
  * 提案信息Service业务层处理
  * 
@@ -205,6 +207,13 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
             throw new ServiceException("请等待交办单位审核完成！");
         }
         if(proposalInfo.getZxFjList()!=null && proposalInfo.getZxFjList().size()>0){
+            ZxFj fj = new ZxFj();
+            fj.setSourceId(proposalInfo.getProposalId());
+            fj.setMainId(proposalInfo.getProposalId());
+            fj.setType(ONE);
+            fj.setStytle(FIV);
+            //删除附件
+            zxFjMapper.deleteZxFj(fj);
             for (ZxFj zxFj : proposalInfo.getZxFjList()) {
                 zxFj.setMainId(proposalInfo.getProposalId());
                 zxFj.setSourceId(proposalInfo.getProposalId());
@@ -278,8 +287,13 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
     @Override
     public int updateProposalInfo(ProposalInfo proposalInfo)
     {
+        ZxFj fj = new ZxFj();
+        fj.setSourceId(proposalInfo.getProposalId());
+        fj.setMainId(proposalInfo.getProposalId());
+        fj.setType(ONE);
+        fj.setStytle(FOR);
         //删除附件
-        zxFjMapper.deleteZxFjBySourceId(proposalInfo.getProposalId());
+        zxFjMapper.deleteZxFj(fj);
         //删除人员
         proposalUserMapper.deleteProposalUserByProposalId(proposalInfo.getProposalId());
         proposalInfo.setUpdateTime(DateUtils.getNowDate());

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

@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.SqmyInfoMapper;
 import com.ruoyi.system.service.ISqmyInfoService;
 
+import static com.ruoyi.common.constant.CommonConstants.*;
+
 /**
  * 社情民意信息Service业务层处理
  * 
@@ -230,8 +232,13 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
     @Override
     public int updateSqmyInfo(SqmyInfo sqmyInfo)
     {
+        ZxFj fj = new ZxFj();
+        fj.setSourceId(sqmyInfo.getSqmyId());
+        fj.setMainId(sqmyInfo.getSqmyId());
+        fj.setType(TWO);
+        fj.setStytle(FOR);
         //删除附件
-        zxFjMapper.deleteZxFjBySourceId(sqmyInfo.getSqmyId());
+        zxFjMapper.deleteZxFj(fj);
         if(sqmyInfo.getZxFjList()!=null && sqmyInfo.getZxFjList().size()>0){
             for (ZxFj zxFj : sqmyInfo.getZxFjList()) {
                 zxFj.setMainId(sqmyInfo.getSqmyId());
@@ -333,6 +340,14 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
     @Override
     public AjaxResult zxIdea(SqmyInfo sqmyInfo) {
         sqmyInfo.setUpdateTime(DateUtils.getNowDate());
+        ZxFj fj = new ZxFj();
+        fj.setSourceId(sqmyInfo.getSqmyId());
+        fj.setMainId(sqmyInfo.getSqmyId());
+        fj.setType(TWO);
+        fj.setStytle(SIX);
+        //删除附件
+        zxFjMapper.deleteZxFj(fj);
+
         if(sqmyInfo.getZxFjList()!=null && sqmyInfo.getZxFjList().size()>0){
             for (ZxFj zxFj : sqmyInfo.getZxFjList()) {
                 zxFj.setMainId(sqmyInfo.getSqmyId());