物资新购新增多表查询

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java

@@ -95,7 +95,7 @@ public class PurchaseCheckDetailsController extends BaseController {
     @ApiOperation(value = "修改新购验收任务详细")
     @PreventRepeatSubmit
     @RequiresPermissions("purchase:details:edit")
-    @SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改新购验收任务详细")
+    @SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, module = "仓储管理->修改新购验收任务详细")
     @PutMapping
     public AjaxResult edit(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
         try {

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java

@@ -29,6 +29,12 @@ public interface PurchaseCheckDetailsMapper {
      */
     PurchaseCheckDetails selectPurchaseCheckDetailsById(Long id);
 
+    /**
+     * 根据任务id查询新购验收任务详细列表--Join查询
+     * @param taskId 任务id
+     */
+    List<PurchaseCheckDetails> selectPurchaseCheckDetailsListByTaskId(Long taskId);
+
     /**
      * 查询新购验收任务详细列表
      * 

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -47,9 +47,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
         PurchaseCheckInfo purchaseCheckInfo = purchaseCheckInfoMapper.selectPurchaseCheckInfoById(id);
         if (purchaseCheckInfo != null) {
             purchaseCheckDtoResult.setPurchaseCheckInfo(purchaseCheckInfo);
-            PurchaseCheckDetails purchaseCheckDetailDto = new PurchaseCheckDetails();
+            List<PurchaseCheckDetails> purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByTaskId(purchaseCheckInfo.getTaskId());
-            purchaseCheckDetailDto.setTaskId(purchaseCheckInfo.getTaskId());
-            List<PurchaseCheckDetails> purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsList(purchaseCheckDetailDto);
             if (purchaseCheckDetails != null) {
                 purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails);
             }

bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml

@@ -7,6 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="taskId"    column="task_id"    />
         <result property="typeId"    column="type_id"    />
+        <result property="typeName"    column="type_name"    />
+        <result property="maTypeName"    column="ma_type_name"    />
         <result property="purchasePrice"    column="purchase_price"    />
         <result property="purchaseNum"    column="purchase_num"    />
         <result property="checkNum"    column="check_num"    />
@@ -34,6 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, task_id, type_id, purchase_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id from purchase_check_details
     </sql>
 
+    <sql id="selectPurchaseCheckDetailsJoinVo">
+        select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result,
+               pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time,
+               pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name,
+               pcd.file_url, pcd.company_id, mt.type_name, mtp.type_name as ma_type_name
+        from purchase_check_details pcd
+        left join ma_type mt on pcd.type_id = mt.type_id
+        left join ma_type mtp on mt.parent_id = mtp.type_id
+    </sql>
+
     <select id="selectPurchaseCheckDetailsList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckDetails" resultMap="PurchaseCheckDetailsResult">
         <include refid="selectPurchaseCheckDetailsVo"/>
         <where>  
@@ -62,6 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPurchaseCheckDetailsVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectPurchaseCheckDetailsListByTaskId" parameterType="Long" resultMap="PurchaseCheckDetailsResult">
+        <include refid="selectPurchaseCheckDetailsJoinVo"/>
+        where pcd.task_id = #{taskId}
+    </select>
         
     <insert id="insertPurchaseCheckDetails" parameterType="com.bonus.material.purchase.domain.PurchaseCheckDetails" useGeneratedKeys="true" keyProperty="id">
         insert into purchase_check_details