试运行问题修复

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmReportController.java

@@ -78,6 +78,46 @@ public class BmReportController extends BaseController {
         return AjaxResult.success(getDataTable(pageList));
     }
 
+
+    /**
+     * 新购入库验收合格报表详情查询
+     * @param bean
+     * @return
+     */
+    @ApiOperation(value = "设备追溯查询--新购入库验收合格报表详情查询")
+    @GetMapping("/getPurChaseReportSuccessList")
+    public AjaxResult getPurChaseReportSuccessList(PurChaseReportInfo bean) {
+        startPage();
+        List<PurChaseReportDetails> pageList = bmReportService.getPurChaseReportSuccessList(bean);
+        return AjaxResult.success(getDataTable(pageList));
+    }
+
+    /**
+     * 新购入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    @ApiOperation(value = "设备追溯查询--新购入库数量报表详情查询")
+    @GetMapping("/getPurChaseReportInBoundList")
+    public AjaxResult getPurChaseReportInBoundList(PurChaseReportInfo bean) {
+        startPage();
+        List<PurChaseReportDetails> pageList = bmReportService.getPurChaseReportInBoundList(bean);
+        return AjaxResult.success(getDataTable(pageList));
+    }
+
+    /**
+     * 新购未入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    @ApiOperation(value = "设备追溯查询--新购未入库数量报表详情查询")
+    @GetMapping("/getPurChaseReportNotInBoundList")
+    public AjaxResult getPurChaseReportNotInBoundList(PurChaseReportInfo bean) {
+        startPage();
+        List<PurChaseReportDetails> pageList = bmReportService.getPurChaseReportNotInBoundList(bean);
+        return AjaxResult.success(getDataTable(pageList));
+    }
+
     /**
      * 导出设备追溯查询-新购入库报表
      * @param response
@@ -90,7 +130,7 @@ public class BmReportController extends BaseController {
         bean.setIsExport(0);
         List<PurChaseReportInfo> list = bmReportService.getPurChaseReportList(bean);
         ExcelUtil<PurChaseReportInfo> util = new ExcelUtil<>(PurChaseReportInfo.class);
-        util.exportExcel(response, list, "设备追溯查询-新购入库报表");
+        util.exportExcel(response, list, "设备追溯查询-新购入库报表采购详情");
     }
 
     /**
@@ -107,6 +147,48 @@ public class BmReportController extends BaseController {
         util.exportExcel(response, list, "设备追溯查询-新购入库报表详情");
     }
 
+    /**
+     * 导出设备追溯查询-新购入库验收合格报表详情
+     * @param response
+     * @param bean
+     */
+    @ApiOperation("导出设备追溯查询-新购入库验收合格报表详情")
+    @PostMapping("/exportPurChaseReportSuccessList")
+    public void exportPurChaseReportSuccessList(HttpServletResponse response, PurChaseReportInfo bean)
+    {
+        List<PurChaseReportDetails> list = bmReportService.getPurChaseReportSuccessList(bean);
+        ExcelUtil<PurChaseReportDetails> util = new ExcelUtil<>(PurChaseReportDetails.class);
+        util.exportExcel(response, list, "设备追溯查询-新购入库报表验收合格详情");
+    }
+
+    /**
+     * 导出设备追溯查询-新购入库数量报表详情
+     * @param response
+     * @param bean
+     */
+    @ApiOperation("导出设备追溯查询-新购入库数量报表详情")
+    @PostMapping("/exportPurChaseReportInBoundList")
+    public void exportPurChaseReportInBoundList(HttpServletResponse response, PurChaseReportInfo bean)
+    {
+        List<PurChaseReportDetails> list = bmReportService.getPurChaseReportInBoundList(bean);
+        ExcelUtil<PurChaseReportDetails> util = new ExcelUtil<>(PurChaseReportDetails.class);
+        util.exportExcel(response, list, "设备追溯查询-新购入库报表入库详情");
+    }
+
+    /**
+     * 导出设备追溯查询-新购未入库报表详情
+     * @param response
+     * @param bean
+     */
+    @ApiOperation("导出设备追溯查询-新购未入库报表详情")
+    @PostMapping("/exportPurChaseReportNotInBoundList")
+    public void exportPurChaseReportNotInBoundList(HttpServletResponse response, PurChaseReportInfo bean)
+    {
+        List<PurChaseReportDetails> list = bmReportService.getPurChaseReportNotInBoundList(bean);
+        ExcelUtil<PurChaseReportDetails> util = new ExcelUtil<>(PurChaseReportDetails.class);
+        util.exportExcel(response, list, "设备追溯查询-新购入库报表未入库详情");
+    }
+
     /**
      * 领料出库报表查询
      * @param bean

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java

@@ -22,6 +22,10 @@ public class PurChaseReportDetails {
     @Excel(name = "规格型号")
     private String typeModelName;
 
+    @ApiModelProperty(value = "设备编码")
+    @Excel(name = "设备编码")
+    private String maCode;
+
     @ApiModelProperty(value = "采购价格含税")
     @Excel(name = "采购价格（含税）")
     private BigDecimal purchasePrice;
@@ -30,7 +34,4 @@ public class PurChaseReportDetails {
     @Excel(name = "采购价格（不含税）")
     private BigDecimal purchasePriceNoTax;
 
-    @ApiModelProperty(value = "设备编码")
-    @Excel(name = "设备编码")
-    private String maCode;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmReportMapper.java

@@ -25,6 +25,27 @@ public interface BmReportMapper {
      */
     List<PurChaseReportDetails> getPurChaseReportDetailsList(PurChaseReportInfo bean);
 
+    /**
+     * 新购入库报表查询详情
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportSuccessList(PurChaseReportInfo bean);
+
+    /**
+     * 新购入库报表查询详情
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportInBoundList(PurChaseReportInfo bean);
+
+    /**
+     * 新购未入库报表查询详情
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportNotInBoundList(PurChaseReportInfo bean);
+
     /**
      * 领料出库报表查询
      * @param bean

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmReportService.java

@@ -25,6 +25,28 @@ public interface BmReportService {
      */
     List<PurChaseReportDetails> getPurChaseReportDetailsList(PurChaseReportInfo bean);
 
+    /**
+     * 新购入库报表详情查询
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportSuccessList(PurChaseReportInfo bean);
+
+    /**
+     * 新购入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportInBoundList(PurChaseReportInfo bean);
+
+    /**
+     * 新购未入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    List<PurChaseReportDetails> getPurChaseReportNotInBoundList(PurChaseReportInfo bean);
+
+
     /**
      * 领料出库报表查询
      * @param bean

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java

@@ -77,6 +77,36 @@ public class BmReportServiceImpl implements BmReportService {
         return bmReportMapper.getPurChaseReportDetailsList(bean);
     }
 
+    /**
+     * 新购入库报表查询详情
+     * @param bean
+     * @return
+     */
+    @Override
+    public List<PurChaseReportDetails> getPurChaseReportSuccessList(PurChaseReportInfo bean) {
+        return bmReportMapper.getPurChaseReportSuccessList(bean);
+    }
+
+    /**
+     * 新购入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    @Override
+    public List<PurChaseReportDetails> getPurChaseReportInBoundList(PurChaseReportInfo bean) {
+        return bmReportMapper.getPurChaseReportInBoundList(bean);
+    }
+
+    /**
+     * 新购未入库数量报表详情查询
+     * @param bean
+     * @return
+     */
+    @Override
+    public List<PurChaseReportDetails> getPurChaseReportNotInBoundList(PurChaseReportInfo bean) {
+        return bmReportMapper.getPurChaseReportNotInBoundList(bean);
+    }
+
     /**
      * 领料出库报表查询
      * @param bean

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java

@@ -182,7 +182,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
                     workApplyInfo.setType(1);
                     workApplyInfo.setWebAppId("9fa73f046ef520b09e94bbffc3b07702");
                     workApplyInfo.setSendUserName(SecurityUtils.getUsername());
-                    workApplyInfo.setTypeId(1);
+                    workApplyInfo.setTypeId(2025050801);
                     workApplyInfo.setBusinessId(String.valueOf(newId));
                     workApplyInfo.setNextStatus("待审核");
                     workApplyInfo.setFlowState(null);

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml

@@ -82,6 +82,114 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getPurChaseReportSuccessList"
+            resultType="com.bonus.material.basic.domain.report.PurChaseReportDetails">
+        SELECT
+        mt2.type_name AS typeName,
+        mt1.type_name AS typeModelName,
+        pcd.purchase_price AS purchasePrice,
+        pcd.purchase_tax_price AS purchasePriceNoTax,
+        bqi.ma_code AS maCode
+        FROM
+        bm_qrcode_info bqi
+        LEFT JOIN ma_type mt1 ON bqi.type_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+        AND mt2.del_flag = '0'
+        LEFT JOIN purchase_check_details pcd ON bqi.task_id = pcd.task_id
+        AND pcd.type_id = bqi.type_id
+        WHERE
+        bqi.task_id = #{taskId} and bqi.type_id = #{typeId} and pcd.status != 12
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            mt2.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR mt1.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR bqi.ma_code LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
+    </select>
+
+    <select id="getPurChaseReportInBoundList"
+            resultType="com.bonus.material.basic.domain.report.PurChaseReportDetails">
+        SELECT
+        mt2.type_name AS typeName,
+        mt1.type_name AS typeModelName,
+        pcd.purchase_price AS purchasePrice,
+        pcd.purchase_tax_price AS purchasePriceNoTax,
+        bqi.ma_code AS maCode
+        FROM
+        bm_qrcode_info bqi
+        left join ma_machine mm on bqi.ma_code = mm.ma_code
+        LEFT JOIN ma_type mt1 ON bqi.type_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+        AND mt2.del_flag = '0'
+        LEFT JOIN purchase_check_details pcd ON bqi.task_id = pcd.task_id
+        AND pcd.type_id = bqi.type_id
+        WHERE
+        bqi.task_id = #{taskId} and bqi.type_id = #{typeId} and bqi.ma_code is not null and mm.ma_status != 0
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            mt2.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR mt1.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR bqi.ma_code LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
+    </select>
+
+    <select id="getPurChaseReportNotInBoundList"
+            resultType="com.bonus.material.basic.domain.report.PurChaseReportDetails">
+        SELECT
+        mt2.type_name AS typeName,
+        mt1.type_name AS typeModelName,
+        pcd.purchase_price AS purchasePrice,
+        pcd.purchase_tax_price AS purchasePriceNoTax,
+        bqi.ma_code AS maCode
+        FROM
+        bm_qrcode_info bqi
+        left join ma_machine mm on bqi.ma_code = mm.ma_code
+        LEFT JOIN ma_type mt1 ON bqi.type_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+        AND mt2.del_flag = '0'
+        LEFT JOIN purchase_check_details pcd ON bqi.task_id = pcd.task_id
+        AND pcd.type_id = bqi.type_id
+        WHERE
+        bqi.task_id = 1149 and bqi.type_id = 517  and mm.ma_status = 0
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            mt2.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR mt1.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR bqi.ma_code LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
+        UNION ALL
+
+        SELECT
+        mt2.type_name AS typeName,
+        mt1.type_name AS typeModelName,
+        pcd.purchase_price AS purchasePrice,
+        pcd.purchase_tax_price AS purchasePriceNoTax,
+        bqi.ma_code AS maCode
+        FROM
+        bm_qrcode_info bqi
+        LEFT JOIN ma_type mt1 ON bqi.type_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+        AND mt2.del_flag = '0'
+        LEFT JOIN purchase_check_details pcd ON bqi.task_id = pcd.task_id
+        AND pcd.type_id = bqi.type_id
+        WHERE
+        bqi.task_id = 1149 and bqi.type_id = 517  and bqi.ma_code is null
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            mt2.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR mt1.type_name LIKE CONCAT('%', #{keyWord}, '%')
+            OR bqi.ma_code LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
+    </select>
+
     <select id="getLeaseOutList" resultType="com.bonus.material.basic.domain.report.LeaseOutInfo">
         SELECT
             mt2.type_name AS typeName,