From 5623ac31995eacf497bdc78b0bf8e142abe6bf41 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Mon, 11 Mar 2024 18:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/domain/SltAgreementInfo.java     | 17 +++++++++
 .../service/impl/BackApplyServiceImpl.java    |  4 ---
 .../mapper/app/BackApplyAppMapper.xml         |  8 +++--
 .../WorkSiteDirectManageController.java       | 36 +++++++++++--------
 .../domain/DirectApplyInfoDetails.java        |  5 ++-
 .../mapper/WorkSiteDirectManageMapper.java    |  2 ++
 .../service/WorkSiteDirectManageService.java  |  2 ++
 .../impl/WorkSiteDirectManageImpl.java        | 15 ++++++++
 .../material/WorkSiteDirectManageMapper.xml   | 17 +++++++--
 9 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
index 879b846b..64475a59 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
@@ -16,6 +16,23 @@ public class SltAgreementInfo {
      *协议id
      */
     private String agreementId;
+    /**
+     *编码
+     */
+    private String maCode;
+
+    /**
+     *直转数量
+     */
+    private Integer rotationNum;
+    /**
+     *当前在用量
+     */
+    private Integer useNum;
+    /**
+     * 机具规格
+     */
+    private String typeModelName;
     /**
      *机具规格id
      */
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
index 0c3976cb..367ea0b0 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
@@ -103,12 +103,10 @@ public class BackApplyServiceImpl implements BackApplyService {
         String username = SecurityUtils.getLoginUser().getUsername();
         record.setCreateBy(username);
         if (roles.contains("jjfgs") || roles.contains("admin")) {
-            record.setCompanyId("101");
             record.setStatus("1");
             return backApplyMapper.audit(record);
         }
         if (roles.contains("tsfgs") || roles.contains("admin")) {
-            record.setCompanyId("102");
             record.setStatus("3");
             return backApplyMapper.audit(record);
         }
@@ -134,12 +132,10 @@ public class BackApplyServiceImpl implements BackApplyService {
         String username = SecurityUtils.getLoginUser().getUsername();
         record.setCreateBy(username);
         if (roles.contains("jjfgs") || roles.contains("admin")) {
-            record.setCompanyId("101");
             record.setStatus("2");
             return backApplyMapper.refuse(record);
         }
         if (roles.contains("tsfgs") || roles.contains("admin")) {
-            record.setCompanyId("102");
             record.setStatus("4");
             return backApplyMapper.refuse(record);
         }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
index f88e7766..bd1e4503 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
@@ -280,20 +280,21 @@
         LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
         SET bai.status = #{status},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
       WHERE
-        bai.id = #{id} and bai.company_id = #{companyId}
+        bai.id = #{id}
     </update>
 
   <update id="refuse">
     UPDATE tm_task tt
       LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
       LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-      SET bai.status = #{status},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
+      SET bai.status = #{status},bai.direct_audit_remark=#{directAuditRemark},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
     WHERE
-      bai.id = #{id} and bai.company_id = #{companyId}
+      bai.id = #{id}
   </update>
   <update id="examineListByUser">
     SELECT
       bai.id,
+      bai.status,
       bai.back_person as backPerson,
       bai.phone,
       bpl.lot_name as lotName,
@@ -481,6 +482,7 @@
   <select id="examineList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
     SELECT
       bai.id,
+      bai.status,
       bai.back_person as backPerson,
       bai.phone,
       bpl.lot_name as lotName,
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
index 745fd7c1..f4b9737f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
@@ -8,10 +8,8 @@ import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
+import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.DirectApplyInfoDetails;
-import com.bonus.sgzb.material.domain.LeaseApplyDetails;
-import com.bonus.sgzb.material.domain.LeaseApplyInfo;
-import com.bonus.sgzb.material.domain.TmTask;
 import com.bonus.sgzb.material.service.ApplyInfoService;
 import com.bonus.sgzb.material.service.TaskService;
 import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
@@ -21,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
@@ -73,20 +72,25 @@ public class WorkSiteDirectManageController extends BaseController {
      */
     @ApiOperation(value = "保存直转方和接收方数据")
     @PostMapping("/submit")
-    public AjaxResult submit(@RequestBody List<DirectApplyInfoDetails> directApplyInfoDetails) {
-        if (CollUtil.isNotEmpty(directApplyInfoDetails)) {
-            for (DirectApplyInfoDetails directApplyInfoDetail : directApplyInfoDetails) {
-                if (directApplyInfoDetail.getDirectApplyInfos() != null) {
-                    DirectApplyInfo directApplyInfos = directApplyInfoDetail.getDirectApplyInfos();
-                    int i = workSiteDirectManageService.saveDirectApplyInfo(directApplyInfos);
-                    if (i < 0) {
-                        return AjaxResult.success("保存失败");
-                    }
+    public AjaxResult submit(@RequestBody DirectApplyInfoDetails directApplyInfoDetails) {
+        int id = 0;
+        if (directApplyInfoDetails != null) {
+            if (directApplyInfoDetails.getDirectApplyInfo() != null) {
+                DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo();
+                directApplyInfos.setCode(workSiteDirectManageService.genderLeaseCode());
+                directApplyInfos.setCreateTime(new Date());
+                int i = workSiteDirectManageService.saveDirectApplyInfo(directApplyInfos);
+                if (i < 0) {
+                    return AjaxResult.success("保存失败");
                 }
+                id = directApplyInfos.getId();
+            }
 
-                if (directApplyInfoDetail.getDirectApplyInfoDetails() != null) {
-                    DirectApplyDetails directApplyDetails = directApplyInfoDetail.getDirectApplyInfoDetails();
-                    int i = workSiteDirectManageService.saveDirectApplyDetails(directApplyDetails);
+            if (directApplyInfoDetails.getDirectApplyInfoDetails() != null) {
+                List<DirectApplyDetails> directApplyDetails = directApplyInfoDetails.getDirectApplyInfoDetails();
+                for (DirectApplyDetails directApplyDetail : directApplyDetails) {
+                    directApplyDetail.setDirectId(id);
+                    int i = workSiteDirectManageService.saveDirectApplyDetails(directApplyDetail);
                     if (i < 0) {
                         return AjaxResult.success("保存失败");
                     }
@@ -197,6 +201,8 @@ public class WorkSiteDirectManageController extends BaseController {
     public AjaxResult refuse(@RequestBody DirectApplyInfo directApplyInfo) {
         if (directApplyInfo != null) {
             directApplyInfo.setStatus("2");
+            directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUsername());
+            directApplyInfo.setAuditTime(new Date().toString());
             workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfo);
         } else {
             return AjaxResult.error("参数为空，审核失败");
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectApplyInfoDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectApplyInfoDetails.java
index 5828ba26..30bea736 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectApplyInfoDetails.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectApplyInfoDetails.java
@@ -15,10 +15,9 @@ import java.util.List;
 public class DirectApplyInfoDetails extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    private DirectApplyInfo directApplyInfo;
 
-    private DirectApplyDetails directApplyInfoDetails;
-
-    private DirectApplyInfo directApplyInfos;
+    private List<DirectApplyDetails> directApplyInfoDetails;
 
 
     private TmTask task;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
index ef1ba9bc..4a8e6b56 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
@@ -6,6 +6,7 @@ import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
 import com.bonus.sgzb.base.api.domain.SltAgreementRelation;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,4 +32,5 @@ public interface WorkSiteDirectManageMapper {
     int refuseDirectApplyInfo(DirectApplyInfo directApplyInfos);
 
     List<DirectApplyInfo> getList();
+
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
index 34acb1e5..e681b064 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
@@ -20,4 +20,6 @@ public interface WorkSiteDirectManageService {
    int refuseDirectApplyInfo(DirectApplyInfo directApplyInfos);
 
     List<DirectApplyInfo> getList();
+
+    String genderLeaseCode();
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
index 8740944f..4d782930 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
@@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl;
 import com.bonus.sgzb.base.api.domain.DirectApplyDetails;
 import com.bonus.sgzb.base.api.domain.DirectApplyInfo;
 import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
+import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper;
 import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,4 +54,15 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
     public List<DirectApplyInfo> getList() {
         return workSiteDirectManageMapper.getList();
     }
+
+    @Override
+    public String genderLeaseCode() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        Date date = new Date();
+        String format = simpleDateFormat.format(date);
+        List<DirectApplyInfo> list = workSiteDirectManageMapper.getList();
+        int i = list.size() + 1;
+        String code = "ZZ" + format + "-" + list.size() + i;
+        return code;
+    }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
index e8e19024..337596bd 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper">
-    <insert id="saveDirectApplyInfo" parameterType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
+    <insert id="saveDirectApplyInfo" parameterType="com.bonus.sgzb.base.api.domain.DirectApplyInfo" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
         insert into direct_apply_info
         (
         <if test="code != null and code != ''">
@@ -98,7 +98,20 @@
     </update>
 
     <select id="getUseringData" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
-        select * from slt_agreement_info where agreement_id = #{agreementId} and status = '0'
+        SELECT
+            sai.*,
+            mt.type_name AS typeModelName,
+            mt2.type_name AS typeName,
+            mm.ma_code AS maCode,
+            sum(sai.num) AS useNum
+        FROM
+            slt_agreement_info sai
+        LEFT JOIN ma_type mt on sai.type_id = mt.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+        LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id
+        where sai.agreement_id = #{agreementId} and sai.status = '0'
+        GROUP BY
+            sai.type_id,sai.ma_id
     </select>
     <select id="getList" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
         select * from direct_apply_info