Merge remote-tracking branch 'origin/test' into test

sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java

@@ -41,6 +41,7 @@ public class TokenController {
     @Resource
     private RemoteUserService remoteUserService;
 
+    //web端登录
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form) {
         // 用户登录
@@ -55,6 +56,14 @@ public class TokenController {
         }
     }
 
+    //App端登录
+    @PostMapping("loginApp")
+    public R<?> loginApp(@RequestBody LoginBody form) {
+        // 用户登录
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        return R.ok(tokenService.createToken(userInfo));
+    }
+
     @PostMapping("sendCode")
     public R<?> sendCode(@RequestBody LoginBody form) {
         R<Boolean> sendState = remoteUserService.sendCode(form.getPhone());

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -139,6 +139,17 @@ public class BackReceiveController extends BaseController {
         }
     }
 
+    @Log(title = "退料接收-rfid编码查询", businessType = BusinessType.INSERT)
+    @PostMapping("rfidCodeQuery")
+    public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) {
+        try {
+            List<BackApplyInfo> list =backReceiveService.rfidCodeQuery(record);
+            return AjaxResult.success(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Log(title = "退料接收记录", businessType = BusinessType.INSERT)
     @PostMapping("backReceiveRecord")
     public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) {

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java

@@ -143,7 +143,14 @@ public class BackApplyInfo {
     private List<BackApplyInfo> backApplyDetails;
     private Integer parentId;
     private String sdStatus;
+    /**
+     * 二维码编码
+     */
     private String qrCode;
+    /**
+     * rfid编码
+     */
+    private String rfidCode;
     private String repairedNum;
     private String backId;
     private String repairer;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java

@@ -57,4 +57,11 @@ public interface BackReceiveMapper {
     List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
 
     int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId);
+
+    /**
+     * 退料接收-rfid编码查询
+     * @param record
+     * @return List<BackApplyInfo>
+     */
+    List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java

@@ -21,4 +21,11 @@ public interface BackReceiveService {
     List<BackApplyInfo> qrcodeQuery(BackApplyInfo record);
 
     List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
+
+    /**
+    * 退料接收-rfid编码查询
+    * @param record
+    * @return List<BackApplyInfo>
+    */
+    List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -169,6 +169,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return backReceiveMapper.backReceiveRecord(record);
     }
 
+    @Override
+    public List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record) {
+        return backReceiveMapper.rfidCodeQuery(record);
+    }
+
     private int insertRad(int taskId, List<BackApplyInfo> wxList) {
         int result = 0;
         if(wxList !=null){

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -340,6 +340,20 @@ public class TmTaskServiceImpl implements TmTaskService {
             List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
             for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
                 if (leaseApplyInfo != null) {
+                    SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                    //获取当前用户所属公司id
+                    Long companyId = sysUser.getCompanyId();
+                    //获取当前用户的角色
+                    Set<String> roles = SecurityUtils.getLoginUser().getRoles();
+                    StringBuilder sb = new StringBuilder();
+                    for (String s : roles) {
+                        sb.append(s);
+                    }
+                    String rolesStr = sb.toString();
+                    //如果是内部人员，加上所属公司
+                    if ((rolesStr.contains("jjfgs") && !rolesStr.contains("admin")) || (rolesStr.contains("tsfgs") && !rolesStr.contains("admin"))) {
+                        leaseApplyInfo.setCompanyId(Integer.parseInt(companyId.toString()));
+                    }
                     // 去查询领料任务详情表
                     List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo);
                     if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java

@@ -1,7 +1,7 @@
 package com.bonus.sgzb.base.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.*;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.base.service.RepairService;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java

@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.api.domain;
+package com.bonus.sgzb.base.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java

@@ -3,7 +3,7 @@ package com.bonus.sgzb.base.mapper;
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairPartDetails;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Mapper;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java

@@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service;
 
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.system.api.domain.SysUser;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java

@@ -3,7 +3,7 @@ package com.bonus.sgzb.base.service.impl;
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairPartDetails;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.base.mapper.RepairMapper;
 import com.bonus.sgzb.base.service.RepairService;
@@ -175,7 +175,6 @@ public class RepairServiceImpl implements RepairService {
             for (RepairTaskDetails details : detailsList){
                 details.setCreateBy(loginUser.getUserid());
                 details.setTaskId(task.getTaskId());
-                details.setCompanyId(task.getCompanyId());
                 mapper.addAuditDetails(details);
             }
             task.setAgreementId(agreementId);

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -749,5 +749,22 @@
       AND bai.task_id = #{taskId}
   </select>
 
+  <select id="rfidCodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+      mt.type_id as typeId,
+      mm.ma_id as maId,
+      mm.ma_code as maCode,
+      mt.type_name as typeCode,
+      mt2.type_name as typeName,
+      sd.`name` as sdStatus
+    FROM
+      ma_machine mm
+        LEFT JOIN ma_type mt on mt.type_id=mm.type_id
+        LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
+        LEFT JOIN sys_dic sd on mm.ma_status=sd.id
+    WHERE
+      rfid_code =#{rfidCode}
+  </select>
+
 
 </mapper>

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -603,6 +603,7 @@
         direct_audit_by = #{record.companyAuditBy},
         direct_audit_time = now(),
         direct_audit_remark = #{record.companyAuditRemark},
+        status = #{record.status},
       </if>
       <if test="record.examineStatusId == 33 and record.examineStatusId == '33'">
         update_by = #{record.companyAuditBy},
@@ -640,6 +641,7 @@
         direct_audit_by = #{record.companyAuditBy},
         direct_audit_time = now(),
         direct_audit_remark = #{record.companyAuditRemark},
+        status = #{record.status},
       </if>
     </trim>
     WHERE

sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml

@@ -178,7 +178,7 @@
             tt.create_time DESC
     </select>
 
-    <select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
+    <select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
         select rad.id as id,
                rad.task_id as taskId,
                rad.ma_id as maId,
@@ -213,7 +213,7 @@
         order by rad.create_time desc
     </select>
 
-    <select id="getById" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
+    <select id="getById" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
         select rad.id as id,
                rad.repair_num as repairNum,
                rad.repaired_num as repairedNum,
@@ -248,13 +248,14 @@
         left join sys_dic s2 on s2.p_id = s1.id
         where s1.value = #{value} and s2.status = 0
     </select>
-    <select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
+    <select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
         select id,
                ma_id as maId,
                type_id as typeId,
                repair_num as repairNum,
                repaired_num as repairedNum,
-               scrap_num as scrapNum
+               scrap_num as scrapNum,
+               company_id as companyId
         from repair_apply_details
         where task_id = #{taskId}
     </select>

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java

@@ -163,6 +163,11 @@ public class PurchasePartDetails extends BaseEntity
     @ApiModelProperty(value = "关键字筛选")
     private String keyWord;
 
+    /**
+     * 提交入库时间
+     */
+    private String submitStorageTime;
+
     public void setTaskId(Long taskId)
     {
         this.taskId = taskId;
@@ -447,6 +452,14 @@ public class PurchasePartDetails extends BaseEntity
         this.createTime = createTime;
     }
 
+    public String getSubmitStorageTime() {
+        return submitStorageTime;
+    }
+
+    public void setSubmitStorageTime(String submitStorageTime) {
+        this.submitStorageTime = submitStorageTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java

@@ -25,7 +25,7 @@ public class RepairTaskDetails {
      * 机具ID
      */
     @ApiModelProperty(value = "机具ID")
-    private String maId;
+    private Long maId;
     /**
      * 类型名称
      */
@@ -77,12 +77,14 @@ public class RepairTaskDetails {
     @ApiModelProperty(value = "维修人")
     private String repairer;
     private String keyword;
-    private String typeId;
+    private Long typeId;
     private Long companyId;
+    private String remark;
     /**
      * 任务创建人
      */
     @ApiModelProperty(value = "任务创建人")
     private Long createBy;
+    private Long backId;
 
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java

@@ -80,4 +80,6 @@ public interface RepairAuditDetailsMapper
     int updateStatus(RepairAuditDetails bean);
 
     int insertRepairDetails(RepairTaskDetails repairTaskDetails);
+
+    Long getBackId(Long repairId);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -197,7 +197,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                 }
 
                 if(repairInputList != null && repairInputList.size() > 0){
-                    companyId = repairInputList.get(0).getCompanyId();
+                    if(repairInputList.get(0).getCompanyId() != null){
+                        companyId = repairInputList.get(0).getCompanyId();
+                    }
+
                     taskCode = purchaseCodeRule("R",50);
                     taskStatus = 53;
                     taskType = 50;
@@ -225,7 +228,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     }
                 }
                 if(scrapNumList != null && scrapNumList.size() > 0){
-                    companyId = scrapNumList.get(0).getCompanyId();
+                    if(scrapNumList.get(0).getCompanyId() != null){
+                        companyId = scrapNumList.get(0).getCompanyId();
+                    }
                     taskCode = purchaseCodeRule("BF",57);
                     taskStatus = 58;
                     taskType = 57;
@@ -276,23 +281,27 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     repairDetailList.addAll(auditAllList);
                 }
                 if(repairDetailList != null && repairDetailList.size() > 0){
-                    companyId = repairDetailList.get(0).getCompanyId();
+                    if (repairDetailList.get(0).getCompanyId() != null){
+                        companyId = repairDetailList.get(0).getCompanyId();
+                    }
                     taskCode = purchaseCodeRule("WX",41);
                     taskStatus = 42;
                     taskType = 41;
                     long inputTaskId =  genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
                     for (RepairAuditDetails inputDetails : repairDetailList) {
+                        Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId());
                         // 添加驳回后维修详细表数据
                         RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
                         repairTaskDetails.setTaskId(String.valueOf(inputTaskId));
-                        repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId()));
+                        repairTaskDetails.setMaId(inputDetails.getMaId());
-                        repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId()));
+                        repairTaskDetails.setTypeId(inputDetails.getTypeId());
                         BigDecimal repairNum = inputDetails.getRepairNum();
                         int i = repairNum.intValue(); // 直接转换
                         repairTaskDetails.setRepairNum(i);
                         repairTaskDetails.setStatus("0");
                         repairTaskDetails.setCreateBy(SecurityUtils.getUserId());
                         repairTaskDetails.setCompanyId((long) companyId);
+                        repairTaskDetails.setBackId(backId);
                         repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
                     }
                 }
@@ -309,7 +318,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                 taskMapper.updateTmTask(tmTask);
             }
             if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
-                for (RepairAuditDetails bean : auditDetailList){
+                if (auditDetailList != null) {
+                    for (RepairAuditDetails bean : auditDetailList){
+                        bean.setAuditBy(SecurityUtils.getUserId());
+                        bean.setStatus(status);
+                        repairAuditDetailsMapper.updateStatus(bean);
+                    }
+                }
+            }else {
+                for (RepairAuditDetails bean : auditAllList){
                     bean.setAuditBy(SecurityUtils.getUserId());
                     bean.setStatus(status);
                     repairAuditDetailsMapper.updateStatus(bean);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java

@@ -18,7 +18,7 @@ public class ScrapAudit {
     @ApiModelProperty(value = "不通过原因")
     private String remark;
 
-    @ApiModelProperty(value = "审核任务明细id")
+    @ApiModelProperty(value = "审核任务明细")
     private List<RepairAuditDetails> auditDetailList;
 
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId != null">
             type_id,
         </if>
-        <if test="backNum != null">
+        <if test="repairNum != null">
             repair_num,
         </if>
         <if test="status != null">
@@ -144,13 +144,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update_by,
         </if>
         update_time,
-        <if test="remark != null and remark != ''">
-            remark,
-        </if>
         <if test="companyId != null">
             company_id,
         </if>
-        <if test="id != null">
+        <if test="backId != null">
             back_id,
         </if>
         create_time
@@ -165,8 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId != null">
             #{typeId},
         </if>
-        <if test="backNum != null">
+        <if test="repairNum != null">
-            #{backNum},
+            #{repairNum},
         </if>
         <if test="status != null">
             #{status},
@@ -178,14 +175,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{createBy},
         </if>
         NOW(),
-        <if test="remark != null and remark != ''">
-            #{remark},
-        </if>
         <if test="companyId != null">
             #{companyId},
         </if>
-        <if test="id != null">
+        <if test="backId != null">
-            #{id},
+            #{backId},
         </if>
         NOW()
         )
@@ -383,5 +377,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRepairAuditDetailsVo"/>
         where task_id = #{taskId} and scrap_num > 0
     </select>
+    <select id="getBackId" resultType="java.lang.Long">
+        select back_id
+        from repair_apply_details
+        where id = #{repairId}
+    </select>
 
 </mapper>