修改借用和归还

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.annotation.Excel;
 
 /**
  * Entity基类

ruoyi-psa/src/main/java/com/ruoyi/material/service/impl/PsaMaterialServiceImpl.java

@@ -102,8 +102,11 @@ public class PsaMaterialServiceImpl implements IPsaMaterialService
             psaMaterial.setTypeId(psaMaterialNewDTO.getTypeId());
             psaMaterial.setItemId(detailId);
         }
-
-        psaMaterial.setStock(psaMaterialNewDTO.getStock());
+        if (psaMaterialNewDTO.getStock()==null){
+            psaMaterial.setStock(0L);
+        }else {
+            psaMaterial.setStock(psaMaterialNewDTO.getStock());
+        }
         psaMaterial.setUnit(psaMaterialNewDTO.getUnit());
         psaMaterial.setItemCode(randomCodeGenerator());
         psaMaterial.setRemark(psaMaterialNewDTO.getRemark());

ruoyi-psa/src/main/java/com/ruoyi/materialapply/service/impl/PsaMaterialApplyServiceImpl.java

@@ -62,6 +62,7 @@ public class PsaMaterialApplyServiceImpl implements IPsaMaterialApplyService
         if (StrUtil.isBlank(psaMaterialApply.getDraft())){
             psaMaterialApply.setDraft(AttendanceDraft.NO.getValue());
         }
+        psaMaterialApply.setDelFlag(AttendanceDelFlag.EXIST.getValue());
         return psaMaterialApplyMapper.selectPsaMaterialApplyList(psaMaterialApply);
     }
 

ruoyi-psa/src/main/java/com/ruoyi/materialreturn/service/impl/PsaMaterialReturnServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.materialreturn.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.attendance.enums.AttendanceDelFlag;
 import com.ruoyi.attendance.enums.AttendanceDraft;
 import com.ruoyi.common.utils.DateUtils;
@@ -54,6 +55,10 @@ public class PsaMaterialReturnServiceImpl implements IPsaMaterialReturnService
     @Override
     public List<PsaMaterialReturn> selectPsaMaterialReturnList(PsaMaterialReturn psaMaterialReturn)
     {
+        if (StrUtil.isBlank(psaMaterialReturn.getDraft())){
+            psaMaterialReturn.setDraft(AttendanceDraft.NO.getValue());
+        }
+        psaMaterialReturn.setDelFlag(AttendanceDelFlag.EXIST.getValue());
         return psaMaterialReturnMapper.selectPsaMaterialReturnList(psaMaterialReturn);
     }
 
@@ -69,7 +74,9 @@ public class PsaMaterialReturnServiceImpl implements IPsaMaterialReturnService
     {
         psaMaterialReturn.setCreateBy(SecurityUtils.getUsername());
         psaMaterialReturn.setCheckStatus(MaterialApplyStatus.DSH.getValue());
-        psaMaterialReturn.setDraft(AttendanceDraft.NO.getValue());
+        if (StrUtil.isBlank(psaMaterialReturn.getDraft())){
+            psaMaterialReturn.setDraft(AttendanceDraft.NO.getValue());
+        }
         psaMaterialReturn.setDelFlag(AttendanceDelFlag.EXIST.getValue());
         psaMaterialReturn.setCreateTime(DateUtils.getNowDate());
         int rows = psaMaterialReturnMapper.insertPsaMaterialReturn(psaMaterialReturn);

ruoyi-psa/src/main/resources/mapper/material/PsaMaterialApplyMapper.xml

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkStatus != null  and checkStatus != ''"> and check_status = #{checkStatus}</if>
             <if test="createTime != null "> and date(create_time) = #{createTime}</if>
             <if test="draft != null "> and a.draft = #{draft}</if>
+            <if test="delFlag != null "> and a.del_flag = #{delFlag}</if>
         </where>
     </select>
     

ruoyi-psa/src/main/resources/mapper/material/PsaMaterialEntryMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectPsaMaterialEntryById" parameterType="Long" resultMap="PsaMaterialEntryResult">
         <include refid="selectPsaMaterialEntryVo"/>
-        where id = #{id}
+        where pe.id = #{id}
     </select>
 
 

ruoyi-psa/src/main/resources/mapper/material/PsaMaterialReturnMapper.xml

@@ -77,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and project_id = #{projectId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="checkStatus != null  and checkStatus != ''"> and check_status = #{checkStatus}</if>
+            <if test="draft != null  and draft != ''"> and r.draft = #{draft}</if>
+            <if test="delFlag != null  and delFlag != ''"> and r.del_flag = #{delFlag}</if>
         </where>
     </select>