Merge remote-tracking branch 'origin/master'

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

@@ -690,6 +690,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             recordList = recordList.stream().filter(item -> item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())).collect(Collectors.toList());
             if (recordList.size() > 0) {
                 msg = "监测到" + bmQrcodeInfo.getQrCode() + "符合出库条件,请确认是否出库!";
+            }else{
+                msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件，请检查后重新提交!";
             }
         } else {
             msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件，请检查后重新提交!";

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

@@ -65,6 +65,16 @@ public class PurchaseCheckInfoController extends BaseController {
         return success(purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto));
     }
 
+    /**
+     * 获取新购验收人信息
+     */
+    @ApiOperation("获取新购验收人信息")
+    //@RequiresPermissions("purchase:info:query")
+    @GetMapping(value = "/getCheckUserList")
+    public AjaxResult getCheckUserList(@NotNull(message = "请求对象不能为空") PurchaseQueryDto purchaseQueryDto) {
+        return success(purchaseCheckInfoService.selectPurchaseCheckUserById(purchaseQueryDto));
+    }
+
     /**
      * 新增新购验收任务
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java

@@ -136,4 +136,14 @@ public class PurchaseCheckInfo extends BaseEntity {
     @ApiModelProperty(value = "新购模块阶段名称")
     private String modelName;
 
+
+    private String checkUser;
+
+    public String getCheckUser() {
+        return checkUser;
+    }
+
+    public void setCheckUser(String checkUser) {
+        this.checkUser = checkUser;
+    }
 }

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

@@ -75,4 +75,6 @@ public interface PurchaseCheckInfoMapper {
      * @return 结果
      */
     int deletePurchaseCheckInfoByIds(Long[] ids);
+
+    List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto);
 }

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

@@ -81,4 +81,6 @@ public interface IPurchaseCheckInfoService {
      * @return 结果
      */
     int deletePurchaseCheckInfoById(Long id);
+
+    List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto);
 }

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

@@ -688,4 +688,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
     public int deletePurchaseCheckInfoById(Long id) {
         return purchaseCheckInfoMapper.deletePurchaseCheckInfoById(id);
     }
+
+    @Override
+    public List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto) {
+        return purchaseCheckInfoMapper.selectPurchaseCheckUserById(purchaseQueryDto);
+    }
 }

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

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="companyId"    column="company_id"    />
         <result property="taskStatus"    column="task_status"    />
+        <result property="checkUser"    column="checkUser"    />
     </resultMap>
 
     <resultMap type="com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo" id="PurchaseCheckFormResult">
@@ -152,4 +153,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null "> and pci.task_id = #{taskId}</if>
         </where>
     </select>
+
+    <select id="selectPurchaseCheckUserById" resultMap="PurchaseCheckInfoResult">
+
+        select
+            id, task_id as taskId, auditor as userId, su.nick_name AS checkUser,org_id as orgId
+        from
+            purchase_audit_record pur
+                LEFT JOIN sys_user su on pur.auditor = su.user_id
+        where
+            task_id =#{taskId}
+        GROUP BY auditor
+    </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml

@@ -33,10 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteReduceDetail">
         delete
         from slt_reduce_details
-        where apply_id = #{id};
+        where apply_id = #{id}
-        delete
+
-        from bm_file_info
-        where model_id = #{id}
     </delete>
 
     <select id="selectSltAgreementReduceList" parameterType="com.bonus.material.settlement.domain.SltAgreementReduce" resultMap="SltAgreementReudceResult">