修正

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbCommon.java

@@ -19,6 +19,7 @@ import org.hibernate.validator.constraints.Range;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * 项目申报信息对象 zwyw_xmsb_common
@@ -189,4 +190,10 @@ public class ZwywXmsbCommon extends BaseEntity
 
     @TableField(exist = false)
     private String xmlxName;
+
+    /**
+     * 用来存放关联项目申报备案信息
+     */
+    @TableField(exist = false)
+    private List<ZwywXmsbBaxx> ZwywXmsbBaxxList;
 }

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/mapper/ZwywXmsbBaxxMapper.java

@@ -6,10 +6,12 @@ import com.ruoyi.common.datascope.utils.BaseMapperPlus;
 
 /**
  * 项目申报备案信息Mapper接口
- * 
+ *
  * @author sun
  * @date 2022-10-25
  */
 public interface ZwywXmsbBaxxMapper extends BaseMapperPlus<ZwywXmsbBaxx> {
 
+    //根据项目申报信息id查询关联项目申报备案信息
+    List<ZwywXmsbBaxx> getZwywXmsbBaxxListById(String id);
 }

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbCommonServiceImpl.java

@@ -1,9 +1,11 @@
 package com.ruoyi.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.business.domain.ZwywXmsbBaxx;
 import com.ruoyi.business.domain.ZwywXmsbCommon;
 import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
 import com.ruoyi.business.domain.ZwywXmsbXmlx;
+import com.ruoyi.business.mapper.ZwywXmsbBaxxMapper;
 import com.ruoyi.business.mapper.ZwywXmsbCommonMapper;
 import com.ruoyi.business.mapper.ZwywXmsbXmbdpzMapper;
 import com.ruoyi.business.mapper.ZwywXmsbXmlxMapper;
@@ -22,12 +24,12 @@ import java.util.List;
 
 /**
  * 项目申报信息Service业务层处理
- * 
+ *
  * @author sun
  * @date 2022-10-25
  */
 @Service
-public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService 
+public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
 {
     @Autowired
     private ZwywXmsbCommonMapper zwywXmsbCommonMapper;
@@ -41,9 +43,12 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
     @Autowired
     private ZwywXmsbXmbdpzMapper zwywXmsbXmbdpzMapper;
 
+    @Autowired
+    private ZwywXmsbBaxxMapper zwywXmsbBaxxMapper;
+
     /**
      * 查询项目申报信息
-     * 
+     *
      * @param id 项目申报信息主键
      * @return 项目申报信息
      */
@@ -58,6 +63,9 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
             }
             res.setSzdqName(sysDeptJlMapper.getXzqhNames(res.getSzdq()));
             res.setSzdq(sysDeptJlMapper.getXzqhCodes(res.getSzdq()));
+            //查询项目申报信息关联备案信息list
+            List<ZwywXmsbBaxx> list = zwywXmsbBaxxMapper.getZwywXmsbBaxxListById(id);
+            res.setZwywXmsbBaxxList(list);
         }
         return res;
     }
@@ -70,7 +78,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
 
     /**
      * 查询项目申报信息列表
-     * 
+     *
      * @param zwywXmsbCommon 项目申报信息
      * @return 项目申报信息
      */
@@ -102,7 +110,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
 
     /**
      * 新增项目申报信息
-     * 
+     *
      * @param zwywXmsbCommon 项目申报信息
      * @return 结果
      */
@@ -115,7 +123,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
 
     /**
      * 修改项目申报信息
-     * 
+     *
      * @param zwywXmsbCommon 项目申报信息
      * @return 结果
      */
@@ -127,7 +135,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
 
     /**
      * 批量删除项目申报信息
-     * 
+     *
      * @param ids 需要删除的项目申报信息主键
      * @return 结果
      */

ruoyi-modules/mz-business-xmsb/src/main/resources/mapper/business/ZwywXmsbBaxxMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.ZwywXmsbBaxxMapper">
-    
+
     <resultMap type="ZwywXmsbBaxx" id="ZwywXmsbBaxxResult">
         <result property="id"    column="id"    />
         <result property="sbId"    column="sb_id"    />
@@ -25,4 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
     </resultMap>
 
-</mapper>
+    <select id="getZwywXmsbBaxxListById" resultMap="ZwywXmsbBaxxResult">
+        select id,sbId,bazt,shyj,bz,createTimeStr,createUserId,createBy,createUserType,createAreaCode,createUnit,createUnitName,updateTimeStr,updateUserId,updateBy,updateUnit,updateUnitName,state
+        from zwyw_xmsb_baxx
+        where sbId = #{id}
+    </select>
+</mapper>

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywXmsbCommonController.java

@@ -3,6 +3,7 @@ package com.ruoyi.business.controller;
 import com.ruoyi.business.domain.ZwywXmsbCommon;
 import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
 import com.ruoyi.business.service.IZwywXmsbCommonService;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -23,7 +24,7 @@ import java.util.List;
 
 /**
  * 项目申报信息Controller
- * 
+ *
  * @author sun
  * @date 2022-10-25
  */
@@ -41,6 +42,9 @@ public class ZwywXmsbCommonController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZwywXmsbCommon zwywXmsbCommon)
     {
+        if (zwywXmsbCommon.getXmlx() == null || "".equals(zwywXmsbCommon.getXmlx())){
+            throw new ServiceException("项目类型不能为空");
+        }
         startPage();
         List<ZwywXmsbCommon> list = zwywXmsbCommonService.selectZwywXmsbCommonList(zwywXmsbCommon);
         return getDataTable(list);
@@ -87,6 +91,9 @@ public class ZwywXmsbCommonController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody ZwywXmsbCommon zwywXmsbCommon)
     {
+        if (zwywXmsbCommon.getXmlx() == null || "".equals(zwywXmsbCommon.getXmlx())){
+            return AjaxResult.error("项目类型不能为空");
+        }
         return toAjax(zwywXmsbCommonService.insertZwywXmsbCommon(zwywXmsbCommon),zwywXmsbCommon.getId());
     }
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywXmsbFjlxController.java

@@ -2,6 +2,7 @@ package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.ZwywXmsbFjlx;
 import com.ruoyi.business.service.IZwywXmsbFjlxService;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -19,7 +20,7 @@ import java.util.List;
 
 /**
  * 项目申报附件类型信息Controller
- * 
+ *
  * @author sun
  * @date 2022-10-25
  */
@@ -37,6 +38,9 @@ public class ZwywXmsbFjlxController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZwywXmsbFjlx zwywXmsbFjlx)
     {
+        if (zwywXmsbFjlx.getXmlxId() == null || "".equals(zwywXmsbFjlx.getXmlxId())){
+            throw  new ServiceException("项目类型不能为空");
+        }
         startPage();
         List<ZwywXmsbFjlx> list = zwywXmsbFjlxService.selectZwywXmsbFjlxList(zwywXmsbFjlx);
         return getDataTable(list);
@@ -73,6 +77,9 @@ public class ZwywXmsbFjlxController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody ZwywXmsbFjlx zwywXmsbFjlx)
     {
+        if (zwywXmsbFjlx.getXmlxId() == null || "".equals(zwywXmsbFjlx.getXmlxId())){
+            return AjaxResult.error("项目类型不能为空");
+        }
         return toAjax(zwywXmsbFjlxService.insertZwywXmsbFjlx(zwywXmsbFjlx),zwywXmsbFjlx.getId());
     }