bug修复

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

@@ -252,8 +252,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             //冲减帐
             int l = updateTimeAccount( bean);
         } catch (Exception e) {
-            log.error("出库时间修改成功", e.getMessage());
+            log.error("出库时间修改失败", e.getMessage());
-            throw new RuntimeException("出库时间修改成功");
+            throw new RuntimeException("出库时间修改失败");
         }
         return AjaxResult.success("出库时间修改成功");
     }
@@ -317,7 +317,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             fee.setLeaseFee(leaseFee);
             fee.setStartTime(StartTime+"");
             fee.setEndTime(endTime+"");
-            fee.setCostType(1);
+            fee.setCostType(0);
             fee.setDays(day);
             fee.setAgreementId(agreementId);
             //4存入临时表
@@ -331,7 +331,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
 
         Date preTime = bean.getPreTime();
         Date outTime = bean.getOutTime();
-        //判断修改前和修改后的时间是否在本月区间（上个月21号-到当月20号），若果在则isNeed=0,否则，修改后的时间在当月之前则isNeed=1，修改时间在时间之后则isNeed=2
+        //判断修改前和修改后的时间是否在本月区间（上个月21号-到当月20号），如果在则isNeed=0,否则，修改后的时间在当月之前则isNeed=1，修改时间在时间之后则isNeed=2
         isNeed = checkTimeInCycle(preTime, outTime);
 
         return isNeed;

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

@@ -625,7 +625,7 @@ public class RepairServiceImpl implements RepairService {
                                 audit.setCompanyId(null); // 或其他默认值
                             }
                             mapper.insertAuditDetails(audit);
-                        }else{   //维修数量不够
+                        }else if((bean.getRepairNum() < repairNumNeed && bean.getRepairNum()!=0)){   //维修数量不够
                             int addNum = item.getRepairedNum() + bean.getRepairNum();
                             int countOne = mapper.updateAddNum(item.getId(), addNum, bean.getRepairer(), loginUser.getUserid());
                             if (countOne!= 1) {
@@ -725,6 +725,7 @@ public class RepairServiceImpl implements RepairService {
                             RepairAuditDetails audit  = new RepairAuditDetails();
                             audit.setRepairId(item.getId());
                             audit.setTypeId(Long.valueOf(bean.getTypeId()));
+                            audit.setParentId(beanTemp.getId());
                             audit.setRepairNum(repairNumNeed);
                             audit.setRepairedNum(repairNumNeed);
                             audit.setCreateBy(String.valueOf(loginUser.getUserid()));
@@ -735,7 +736,7 @@ public class RepairServiceImpl implements RepairService {
                                 audit.setCompanyId(null); // 或其他默认值
                             }
                             mapper.insertAuditDetails(audit);
-                        }else{   //维修数量不够
+                        }else if((bean.getRepairNum() < repairNumNeed && bean.getRepairNum()!=0)){   //维修数量不够
                             int addNum = item.getRepairedNum() + bean.getRepairNum();
                             int countOne = mapper.updateAddNumTwo(item.getId(), addNum, loginUser.getUserid());
                             if (countOne!= 1) {
@@ -803,7 +804,7 @@ public class RepairServiceImpl implements RepairService {
                         int repairNumAll = item.getRepairedNum() + item.getScrapNum();
                         int repairNumNeed = item.getRepairNum() -  repairNumAll;
                         if (bean.getScrapNum() >= repairNumNeed) {  //维修数量够
-                            int remainNum = bean.getRepairNum() - repairNumNeed;
+                            int remainNum = bean.getScrapNum() - repairNumNeed;
                             int addNum = item.getScrapNum() + repairNumNeed;
                             int countOne = mapper.updateRemainScrapNum(item.getId(), addNum, loginUser.getUserid());
                             if (countOne != 1) {
@@ -826,7 +827,7 @@ public class RepairServiceImpl implements RepairService {
                                 audit.setCompanyId(null); // 或其他默认值
                             }
                             mapper.insertAuditDetails(audit);
-                        }else{   //维修数量不够
+                        }else if (bean.getScrapNum() < repairNumNeed && bean.getScrapNum()!=0){   //维修数量不够
                             int addNum = item.getScrapNum() + bean.getScrapNum();
                             int countOne = mapper.updateAddScrapNum(item.getId(), addNum,loginUser.getUserid());
                             if (countOne!= 1) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java

@@ -110,13 +110,25 @@ public class RepairAuditDetailsController extends BaseController {
         List<RepairAuditDetails> list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails);
         return getDataTable(list);
     }
+//    /**
+//     * 查看保养记录表
+//     */
+//    @ApiOperation("查看修饰审核任务详细列表")
+//    @GetMapping("/getMaintenanceRecords")
+//    public AjaxResult getMaintenanceRecords(RepairAuditDetails repairAuditDetails) {
+//        ScrapApplyDetailsVO vo = repairAuditDetailsService.getMaintenanceRecords(repairAuditDetails);
+//        return AjaxResult.success(vo);
+//    }
+
     /**
      * 查看保养记录表
      */
     @ApiOperation("查看修饰审核任务详细列表")
     @GetMapping("/getMaintenanceRecords")
+//    @RequiresPermissions("service:auditing:list")
     public AjaxResult getMaintenanceRecords(RepairAuditDetails repairAuditDetails) {
-        ScrapApplyDetailsVO vo = repairAuditDetailsService.getMaintenanceRecords(repairAuditDetails);
+
+        RepairAuditDetailsNew vo = repairAuditDetailsService.getMaintenanceRecords(repairAuditDetails);
         return AjaxResult.success(vo);
     }
 

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

@@ -76,6 +76,14 @@ public class BackRecord {
     @Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC)
     private Integer backNum;
 
+
+    /**
+     * 备注
+     */
+    @Excel(name = "损坏情况")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     /**
      * 退料人
      */
@@ -140,11 +148,6 @@ public class BackRecord {
     @Excel(name = "退料工程")
     private String proName;
 
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String remark;
 
     /**
      * 关键字

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

@@ -164,7 +164,7 @@ public interface RepairAuditDetailsMapper
 
     void updateRecodeStatus(String id);
 
-    ScrapApplyDetailsVO getMaintenanceRecords(RepairAuditDetails repairAuditDetails);
+    RepairAuditDetailsNew getMaintenanceRecords(RepairAuditDetails repairAuditDetails);
 
     List<RepairContent> getRepairContent(ScrapApplyDetailsVO scrapApplyDetailsVO);
 

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

@@ -103,6 +103,6 @@ public interface IRepairAuditDetailsService
 
     List<RepairPart> getPartRecord(RepairAuditDetails repairAuditDetails);
 
-    ScrapApplyDetailsVO getMaintenanceRecords(RepairAuditDetails repairAuditDetails);
+    RepairAuditDetailsNew getMaintenanceRecords(RepairAuditDetails repairAuditDetails);
 }
 

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

@@ -754,6 +754,8 @@ public class BackApplyServiceImpl implements BackApplyService {
             if (StringUtils.isNotNull(backApplyInfoId)) {
                 List<BackApplyInfo> leaseApplyDetailsList = bean.getBackApplyDetails();
                 for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
+                    //记录backNum
+                    int backNum = leaseApplyDetails.getBackNum();
                     // 首先判断附件是否存在
                     if (CollectionUtils.isNotEmpty(leaseApplyDetails.getFileList())) {
                         for (FileInfo fileInfo : leaseApplyDetails.getFileList()) {
@@ -813,6 +815,7 @@ public class BackApplyServiceImpl implements BackApplyService {
                     if ("1".equals(leaseApplyDetails.getManageType()) &&
                             bean.getIsFinishBack() != null && bean.getIsFinishBack() == 1) {
                         //更新结算表 slt_agreement_info
+                        leaseApplyDetails.setBackNum(backNum);
                         leaseApplyDetails.setAgreementId(bean.getAgreementId());
                         leaseApplyDetails.setEndTime(backTime);
                         int r = updateSlt4Bean(leaseApplyDetails);

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

@@ -178,23 +178,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
     }
 
     @Override
-    public ScrapApplyDetailsVO getMaintenanceRecords(RepairAuditDetails repairAuditDetails) {
+    public RepairAuditDetailsNew getMaintenanceRecords(RepairAuditDetails repairAuditDetails) {
-        ScrapApplyDetailsVO scrapApplyDetailsVO = repairAuditDetailsMapper.getMaintenanceRecords(repairAuditDetails);
+        RepairAuditDetailsNew vo = repairAuditDetailsMapper.getMaintenanceRecords(repairAuditDetails);
-        if (scrapApplyDetailsVO != null) {
+
-            // 查询技术鉴定情况和维修处理情况
+        return vo;
-            if (StringUtils.isNotBlank(scrapApplyDetailsVO.getMaId())) {
-                List<RepairContent> records = new ArrayList<>();
-                for (String s : scrapApplyDetailsVO.getMaId().split(",")) {
-                    scrapApplyDetailsVO.setMaId(s);
-                    records.addAll(repairAuditDetailsMapper.getRepairContent(scrapApplyDetailsVO));
-                }
-                scrapApplyDetailsVO.setRecords(records);
-            } else {
-                List<RepairContent> repairContent = repairAuditDetailsMapper.getRepairContent(scrapApplyDetailsVO);
-                scrapApplyDetailsVO.setRecords(repairContent);
-            }
-        }
-        return scrapApplyDetailsVO;
     }
 
     /**
@@ -494,7 +481,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     //库存增加
                     RepairAuditDetailsNew newRepair = repairAuditDetailsMapper.getRepairNumByParentId(parentId);
                     repairAuditDetailsMapper.updateStorageNum(newRepair);
-                    repairAuditDetailsMapper.updateMaChineStatus(detail.getMaId(),14);
+                    repairAuditDetailsMapper.updateMaChineStatus(detail.getMaId(),15);
                 }
             }
 

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

@@ -1036,6 +1036,12 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
                      for (ScrapApplyDetailsVONew voNew : list) {
                          int countFour = scrapApplyDetailsMapper.updateTypeStorageNum(voNew);
                      }
+                     List<ScrapApplyDetailsVONew> listTwo = scrapApplyDetailsMapper.getMaChineScrapList(vo);
+                     if (listTwo.size() > 0) {
+                         for (ScrapApplyDetailsVONew voNew : listTwo) {
+                             int countThree = scrapApplyDetailsMapper.updateMaChineStatus(voNew.getMaId(), 15);
+                         }
+                     }
                      //驳回时修改状态
                      vo.setAuditByBF(SecurityUtils.getLoginUser().getUsername());
                      vo.setUpdateBy(SecurityUtils.getLoginUser().getUsername());

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

@@ -78,4 +78,10 @@ public class RepairAuditDetailsNew {
 
     private int typeId;
 
+    private String auditBy;
+
+    private String repairRemark;
+
+    private String repairRemarkBefore;
+
 }

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

@@ -424,6 +424,7 @@
         <if test="createTime !=null and createTime != ''">
             AND DATE(rar.create_time) = #{createTime}
         </if>
+        group by rar.id
         order by rar.create_time desc
     </select>
 

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

@@ -106,7 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             baif.back_person AS backPerson,
             bcd.create_time AS createTime,
             bpl.lot_name AS proName,
-            bui.unit_name AS unitName
+            bui.unit_name AS unitName,
+            bcd.remark AS remark
         FROM
             back_check_details bcd
                 LEFT JOIN back_apply_info baif ON baif.id = bcd.parent_id

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

@@ -385,19 +385,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         IFNULL(sum(rad.repaired_num), 0) as repairedNum,
         IFNULL(sum(rad.scrap_num), 0) as scrapNum,
         rad.status as taskStatus,
-        rar.create_by as createBy,
         DATE_FORMAT(rar.create_time, '%Y-%m-%d') as createTime,
         rad.audit_remark as remark,
         mt2.type_name as typeName,
         mt.type_name as type,
         su.nick_name as repairer,
-        rar.repair_type as repairType
+        rar.repair_type as repairType,
+        su1.nick_name as auditBy
         from
         repair_audit_details rad
         left join repair_apply_record rar on rad.parent_id = rar.id
         left join ma_machine mm on mm.ma_id = rad.ma_id
         left join ma_type mt on rar.type_id = mt.type_id
         left join sys_user su on rar.create_by = su.user_id
+        left join sys_user su1 on rad.audit_by = su1.user_id
         LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         where
         1=1
@@ -413,7 +414,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
             and rar.create_time between #{params.beginTime} and #{params.endTime}
         </if>
-        group by rad.parent_id,rad.create_time,rad.type_id,rad.status,rad.audit_remark,mm.ma_code
+        group by rad.parent_id,rad.create_time,rad.type_id,su1.nick_name,rad.status,rad.audit_remark,mm.ma_code
         order by rar.create_time desc
 <!--        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">-->
 <!--            and tk.create_time between #{params.beginTime} and #{params.endTime}-->
@@ -592,44 +593,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             rc.repair_id = #{repairId}
     </select>
-    <select id="getMaintenanceRecords" resultType="com.bonus.sgzb.material.vo.ScrapApplyDetailsVO">
+    <select id="getMaintenanceRecords" resultType="com.bonus.sgzb.material.vo.RepairAuditDetailsNew">
-        SELECT
+        select
-            tk.task_id taskId,
+            rad.parent_id as parentId,
-            tk.CODE repairCode,
+            rad.create_time,
-            bui.unit_name unitName,
-            bpl.lot_name projectName,
-            su.nick_name createBy,
-            su1.nick_name as checkMan,
             rad.type_id,
-            mt.type_name,
+            mm.ma_id as maId,
-            mt1.type_name type,
+            mm.ma_code as maCode,
-            GROUP_CONCAT(rad.ma_id) as maId,
+            IFNULL(sum(rad.repair_num), 0) as repairNum,
-            rad.repaired_num,
+            IFNULL(sum(rad.repaired_num), 0) as repairedNum,
-            rad.audit_time,
+            IFNULL(sum(rad.scrap_num), 0) as scrapNum,
-            mm.ma_code,
+            rad.status as taskStatus,
-            GROUP_CONCAT(COALESCE(mm.ma_code, ''), '-', COALESCE(rd.repair_remark, '')) AS repairRemark,
+            DATE_FORMAT(rar.create_time, '%Y-%m-%d') as createTime,
-            rd.task_id repairTaskId
+            rad.audit_remark as remark,
-        FROM
+            mt2.type_name as typeName,
-            tm_task tk
+            mt.type_name as type,
-                LEFT JOIN tm_task_agreement tta ON tk.task_id = tta.task_id
+            su.nick_name as repairer,
-                LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+            rar.repair_type as repairType,
-                LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+            su1.nick_name as auditBy,
-                LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
+            GROUP_CONCAT(DISTINCT rap.repair_remark  SEPARATOR ',') as repairRemark,
-                LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id
+            GROUP_CONCAT(DISTINCT rpad.repair_remark  SEPARATOR ',') as repairRemarkBefore
-                LEFT JOIN repair_apply_details rd ON rad.repair_id = rd.id
+        from
-                LEFT JOIN ma_type mt ON rad.type_id = mt.type_id
+            repair_audit_details rad
-                LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+                left join repair_apply_record rar on rad.parent_id = rar.id
-                LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
+                left join repair_apply_details rpad on  rad.repair_id = rpad.id
-                AND rad.ma_id = mm.ma_id
+                left join repair_apply_part rap on rar.id = rap.parent_id
-                LEFT JOIN sys_user su ON su.user_id = tk.create_by
+                left join ma_machine mm on mm.ma_id = rad.ma_id
-                LEFT JOIN sys_user su1 ON su1.user_id = rad.audit_by
+                left join ma_type mt on rar.type_id = mt.type_id
-        WHERE
+                left join sys_user su on rar.create_by = su.user_id
-            tk.task_type = 45
+                left join sys_user su1 on rad.audit_by = su1.user_id
-          AND tk.task_id = #{taskId}
+                LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
-          AND rad.repaired_num > 0
+        where
-        GROUP BY rad.type_id
+            rad.parent_id = #{parentId}
-        ORDER BY
+        group by rad.parent_id,rad.create_time,rad.type_id,su1.nick_name,rad.status,rad.audit_remark,mm.ma_code
-            tk.create_time DESC
     </select>
     <select id="getRepairContent" resultType="com.bonus.sgzb.base.domain.RepairContent">
         SELECT