维修管理优化 完善记录信息

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java

@@ -556,9 +556,18 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
      */
     @Override
     public AjaxResult getMachineById(BackApplyInfo dto) {
-        if (dto == null || dto.getUnitId() == null || dto.getProId() == null || StringUtils.isBlank(dto.getTypeId())) {
+        if (dto == null) {
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "参数不能为空");
         }
+        if (dto.getUnitId() == null) {
+            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "单位ID为空");
+        }
+        if (dto.getProId() == null) {
+            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "工程ID为空");
+        }
+        if (StringUtils.isBlank(dto.getTypeId())) {
+            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "机具类型ID为空");
+        }
         return AjaxResult.success(backApplyInfoMapper.getMachineById(dto));
     }
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java

@@ -73,6 +73,9 @@ public class SupplierInfo extends BaseEntity {
     @ApiModelProperty(value = "状态(0开 1关)")
     private Long status;
 
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
+
     /**
      * 营业执照文件列表
      */

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

@@ -126,7 +126,7 @@ public class PurchaseCheckDetails extends BaseEntity {
     private Long inputNum;
 
     /** 是否入库 */
-    //@Excel(name = "是否入库")
+    @Excel(name = "是否入库", readConverterExp = "0=否,1=是")
     @ApiModelProperty(value = "是否入库")
     private String inputStatus;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/domain/WhHouseInfo.java

@@ -76,5 +76,7 @@ public class WhHouseInfo extends BaseEntity {
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
 
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml

@@ -191,10 +191,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_part_type m2 ON m1.parent_id = m2.pa_id
         and m2.del_flag = '0'
         WHERE m.parent_id = #{paId} and m.del_flag = '0'
-        <if test="type.keyword != null and type.keyword !=''">
+        <if test="type.keyWord != null and type.keyWord !=''">
-            AND (m.pa_name like concat('%',#{type.keyword},'%')
+            AND (m.pa_name like concat('%',#{type.keyWord},'%')
-            or m1.pa_name like concat('%',#{type.keyword},'%')
+            or m1.pa_name like concat('%',#{type.keyWord},'%')
-            or m2.pa_name like concat('%',#{type.keyword},'%')
+            or m2.pa_name like concat('%',#{type.keyWord},'%')
             )
         </if>
     </select>

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml

@@ -31,7 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSupplierInfoList" parameterType="com.bonus.material.ma.domain.SupplierInfo" resultMap="SupplierInfoResult">
         <include refid="selectSupplierInfoVo"/>
         <where>  
-            <if test="supplier != null  and supplier != ''"> and supplier = #{supplier}</if>
+            <if test="supplier != null  and supplier != ''">
+             and supplier like concat('%',#{supplier},'%')
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and supplier like concat('%',#{keyWord},'%')
+            </if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
             <if test="primaryContact != null  and primaryContact != ''"> and primary_contact = #{primaryContact}</if>
@@ -39,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessScope != null  and businessScope != ''"> and business_scope = #{businessScope}</if>
             <if test="businessLicense != null  and businessLicense != ''"> and business_license = #{businessLicense}</if>
             <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="status != null "> and `status` = #{status}</if>
             and del_flag = '0'
         </where>
     </select>

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml

@@ -165,9 +165,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM ma_type AS t
             left join ma_type_keeper mtk on t.type_id = mtk.type_id
             left join ma_type_repair mtr on t.type_id = mtr.type_id
-            left join sys_user su on mtk.user_id = su.user_id
+            left join sys_user su on mtk.user_id = su.user_id and su.del_flag = 0
-            left join sys_user su2 on mtr.user_id = su2.user_id
+            left join sys_user su2 on mtr.user_id = su2.user_id and su2.del_flag = 0
-        WHERE t.type_id = #{typeId}
+        WHERE t.type_id = #{typeId} and t.del_flag = 0
+        limit 1
     </select>
 
     <select id="selectParentId" resultType="java.lang.Integer">

bonus-modules/bonus-material/src/main/resources/mapper/material/warehouse/WhHouseInfoMapper.xml

@@ -32,7 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWhHouseInfoList" parameterType="com.bonus.material.warehouse.domain.WhHouseInfo" resultMap="WhHouseInfoResult">
         <include refid="selectWhHouseInfoVo"/>
-        <where>  
+        <where>
+            <if test="keyWord != null and keyWord != ''">
+                and house_name like concat('%', #{keyWord}, '%')
+            </if>
             <if test="houseName != null  and houseName != ''"> and house_name like concat('%', #{houseName}, '%')</if>
             <if test="physicalName != null and physicalName != ''"> and physical_name like concat('%', #{physicalName}, '%')</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>