Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwXmsbServiceImpl.java

@@ -28,13 +28,12 @@ import static com.ruoyi.common.constant.CommonConstants.TWO;
 
 /**
  * 发改委_申报_主Service业务层处理
- * 
+ *
  * @author boman
  * @date 2023-03-22
  */
 @Service
-public class FgwXmsbServiceImpl implements IFgwXmsbService
-{
+public class FgwXmsbServiceImpl implements IFgwXmsbService {
     @Autowired
     private FgwXmsbMapper fgwXmsbMapper;
     @Autowired
@@ -44,16 +43,15 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     /**
      * 查询发改委_申报_主
-     * 
+     *
      * @param id 发改委_申报_主主键
      * @return 发改委_申报_主
      */
     @Override
-    public FgwXmsb selectFgwXmsbById(Long id)
-    {
+    public FgwXmsb selectFgwXmsbById(Long id) {
         FgwXmsb fgwXmsb = fgwXmsbMapper.selectFgwXmsbById(id);
         List<FgwFj> fgwFjs = fgwFjMapper.selectFgwFjByXmId(fgwXmsb.getId());
-        if (fgwFjs != null && fgwFjs.size() > 0){
+        if (fgwFjs != null && fgwFjs.size() > 0) {
             fgwXmsb.setFjList(fgwFjs);
         }
         return fgwXmsb;
@@ -62,18 +60,18 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     /**
      * 查询发改委_申报_主列表
-     * 
+     *
      * @param fgwXmsb 发改委_申报_主
      * @return 发改委_申报_主
      */
     @Override
-    public List<FgwXmsb> selectFgwXmsbList(FgwXmsb fgwXmsb)
-    {
+    public List<FgwXmsb> selectFgwXmsbList(FgwXmsb fgwXmsb) {
         return fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
     }
 
     /**
      * 统计合格项目
+     *
      * @param fgwXmsb
      * @return
      */
@@ -85,13 +83,12 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     /**
      * 新增发改委_申报_主
-     * 
+     *
      * @param fgwXmsb 发改委_申报_主
      * @return 结果
      */
     @Override
-    public int insertFgwXmsb(FgwXmsb fgwXmsb)
-    {
+    public int insertFgwXmsb(FgwXmsb fgwXmsb) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         fgwXmsb.setCreateTime(DateUtils.getNowDate());
         fgwXmsb.setUserId(user.getUserId());
@@ -102,17 +99,16 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     /**
      * 修改发改委_申报_主
-     * 
+     *
      * @param fgwXmsb 发改委_申报_主
      * @return 结果
      */
     @Override
-    public int updateFgwXmsb(FgwXmsb fgwXmsb)
-    {
+    public int updateFgwXmsb(FgwXmsb fgwXmsb) {
         fgwXmsb.setUpdateTime(DateUtils.getNowDate());
         String progress = fgwXmsb.getProgress();
         String status = fgwXmsb.getStatus();
-        if (ONE.equals(progress) && TWO.equals(status)){
+        if (ONE.equals(progress) && TWO.equals(status)) {
             //修改主表项目进入前期工作手续 待审核
             fgwXmsb.setProgress(TWO);
             fgwXmsb.setStatus(ONE);
@@ -120,14 +116,11 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
         //修改主表项目进入待审核
         fgwXmsb.setStatus(ONE);
         List<FgwFj> fjList = fgwXmsb.getFjList();
-
-        if (fjList != null && fjList.size() > 0){
+        fgwFjMapper.deleteFgwFjByXmId(fgwXmsb.getId(), 1L);
+        if (fjList != null && fjList.size() > 0) {
             //保存新增的
             for (FgwFj fgwFj : fjList) {
-                Long id = fgwFj.getId();
-                if (id != null){
-                    fgwFjMapper.insertFgwFj(fgwFj);
-                }
+                fgwFjMapper.insertFgwFj(fgwFj);
             }
         }
         return fgwXmsbMapper.updateFgwXmsb(fgwXmsb);
@@ -135,25 +128,23 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     /**
      * 批量删除发改委_申报_主
-     * 
+     *
      * @param ids 需要删除的发改委_申报_主主键
      * @return 结果
      */
     @Override
-    public int deleteFgwXmsbByIds(Long[] ids)
-    {
+    public int deleteFgwXmsbByIds(Long[] ids) {
         return fgwXmsbMapper.deleteFgwXmsbByIds(ids);
     }
 
     /**
      * 删除发改委_申报_主信息
-     * 
+     *
      * @param id 发改委_申报_主主键
      * @return 结果
      */
     @Override
-    public int deleteFgwXmsbById(Long id)
-    {
+    public int deleteFgwXmsbById(Long id) {
         return fgwXmsbMapper.deleteFgwXmsbById(id);
     }
 
@@ -164,20 +155,20 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
 
     @Override
     public AjaxResult selectFgwXmsbListAll(FgwXmsb fgwXmsb) {
-        Map<String,Integer> map = new HashMap<>();
-        map.put("all",0);
-        map.put("sbk",0);
-        map.put("xmk",0);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("all", 0);
+        map.put("sbk", 0);
+        map.put("xmk", 0);
         List<FgwXmsb> fgwXmsbList = fgwXmsbMapper.selectFgwXmsbListAll(fgwXmsb);
         Map<String, List<FgwXmsb>> fgwXmsbMap = fgwXmsbList.stream().collect(Collectors.groupingBy(FgwXmsb::getType));
-        if(fgwXmsbList!=null && fgwXmsbList.size()>0){
-            map.put("all",fgwXmsbList.size());
+        if (fgwXmsbList != null && fgwXmsbList.size() > 0) {
+            map.put("all", fgwXmsbList.size());
         }
-        if(fgwXmsbMap.get("1")!=null && fgwXmsbMap.get("1").size()>0){
-            map.put("sbk",fgwXmsbMap.get("1").size());
+        if (fgwXmsbMap.get("1") != null && fgwXmsbMap.get("1").size() > 0) {
+            map.put("sbk", fgwXmsbMap.get("1").size());
         }
-        if(fgwXmsbMap.get("2")!=null && fgwXmsbMap.get("2").size()>0){
-            map.put("xmk",fgwXmsbMap.get("2").size());
+        if (fgwXmsbMap.get("2") != null && fgwXmsbMap.get("2").size() > 0) {
+            map.put("xmk", fgwXmsbMap.get("2").size());
         }
 
         return AjaxResult.success(map);
@@ -187,7 +178,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
     public List<FgwXmsb> xmyjList(FgwXmsb fgwXmsb) {
         List<FgwDbd> fgwDbdList = fgwDbdMapper.selectFgwDbdYjxmNum();
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
-        if(fgwDbdList.size()>0){
+        if (fgwDbdList.size() > 0) {
             List<Long> xmidList = fgwDbdList.stream().map(FgwDbd::getXmId).collect(Collectors.toList());
             fgwXmsb.setIdList(xmidList);
             fgwXmsbList = fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
@@ -200,7 +191,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
     public List<FgwXmsb> cqxmList(FgwXmsb fgwXmsb) {
         List<FgwDbd> fgwDbdListCq = fgwDbdMapper.selectFgwDbdCqxmNum();
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
-        if(fgwDbdListCq.size()>0){
+        if (fgwDbdListCq.size() > 0) {
             List<Long> xmidList = fgwDbdListCq.stream().map(FgwDbd::getXmId).collect(Collectors.toList());
             fgwXmsb.setIdList(xmidList);
             fgwXmsbList = fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);

ruoyi-system/src/main/resources/mapper/system/fgw/FgwFjMapper.xml

@@ -96,8 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <delete id="deleteFgwFjByXmId" parameterType="Long">
-                delete from fgw_fj where xm_id = #{id}
+                delete from fgw_fj where xm_id = #{id} and is_sh != '2'
         <if test="type != null and type == 18"> and type = #{type}</if>
-        <if test="type != null and type != 18"> and type != 18</if>
+        <if test="type != null and type != 18"> and type != '18'</if>
     </delete>
 </mapper>