From aa8d460a0a94671bf62856e98f08aabefddac2f0 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Thu, 21 Dec 2023 10:39:12 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/BackApplyController.java   |   6 +-
 .../sgzb/app/mapper/BackApplyMapper.java      |   2 +-
 .../sgzb/app/service/BackApplyService.java    |   2 +-
 .../service/impl/BackApplyServiceImpl.java    |   4 +-
 .../resources/mapper/app/BackApplyMapper.xml  | 100 ++++++++----------
 5 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
index 8a1753c1..aa5f85b1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java
@@ -241,7 +241,7 @@ public class BackApplyController extends BaseController {
 
     // 退料编号生成规则
     private String purchaseCodeRule() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
         Date nowDate = DateUtils.getNowDate();
         String format = dateFormat.format(nowDate);
         int taskNum = tmTaskService.selectTaskNumByMonth(nowDate,36) + 1;
@@ -279,9 +279,9 @@ public class BackApplyController extends BaseController {
     @ApiOperation("退料审核列表-审核")
     @Log(title = "退料审核列表-审核", businessType = BusinessType.UPDATE)
     @PostMapping("/audit")
-    public AjaxResult audit(String id)
+    public AjaxResult audit(@RequestBody BackApplyInfo record)
     {
-        return toAjax(backApplyService.audit(id));
+        return toAjax(backApplyService.audit(record));
     }
 
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
index d9c0355c..b03610a1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java
@@ -41,5 +41,5 @@ public interface BackApplyMapper {
 
     List<BackApplyInfo> examineView(BackApplyInfo record);
 
-    int audit(String id);
+    int audit(BackApplyInfo record);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
index 5cbf9735..5317c15c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java
@@ -44,5 +44,5 @@ public interface BackApplyService {
 
     List<BackApplyInfo> examineView(BackApplyInfo record);
 
-    int audit(String id);
+    int audit(BackApplyInfo record);
 }
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 d9ed5357..cfc4a4b8 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
@@ -82,8 +82,8 @@ public class BackApplyServiceImpl implements BackApplyService {
     }
 
     @Override
-    public int audit(String id) {
-        return backApplyMapper.audit(id);
+    public int audit(BackApplyInfo record) {
+        return backApplyMapper.audit(record);
     }
 
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index a41bc8b8..00a7303e 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -336,61 +336,51 @@
   </select>
 
   <select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
-    SELECT
-      subquery1.type_id as typeId,
-      subquery1.typeName typeCode,
-      subquery1.typeNames as typeName,
-      subquery1.out_num - COALESCE(subquery2.pre_num, 0) AS num,
-      subquery1.ma_code as maCode
-    FROM
-      (
-        -- 第一个查询作为子查询
-        SELECT
-          mt.type_id,
-          mt.type_name as typeName,
-          CONCAT_WS('/',  IFNULL(mt3.type_name, '')) AS typeNames,
-          lod.out_num,
-          mm.ma_code
-        FROM
-          tm_task_agreement tta
-            LEFT JOIN lease_apply_info lai on lai.task_id=tta.task_id
-            LEFT JOIN lease_out_details lod on lod.parent_id=lai.id
-            LEFT JOIN ma_type mt on mt.type_id=lod.type_id
-            LEFT JOIN tm_task tt on tt.task_id=tta.task_id
-            LEFT JOIN ma_type mt1 ON mt1.type_id=lod.type_id
-            LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
-            LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
-            LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
-            LEFT JOIN ma_machine mm on mm.ma_id=lod.ma_id
-        WHERE
-          tta.agreement_id=#{agreementId}
-          and tt.task_type='29'
-          and tt.task_status='35'
-      ) AS subquery1
-        LEFT JOIN
-      (
-        -- 第二个查询作为子查询
-        SELECT
-          mt.type_id,
-          mt.type_name,
-          CONCAT_WS('/',  IFNULL(mt3.type_name, '')) AS typeNames,
-          bad.pre_num
-        FROM
-          tm_task tt
-            LEFT JOIN tm_task_agreement tta on tta.task_id=tt.task_id
-            LEFT JOIN back_apply_info bai on bai.task_id=tta.task_id
-            LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-            LEFT JOIN ma_type mt on mt.type_id=bad.type_id
-            LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
-            LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
-            LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
-            LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
-        WHERE
-          tta.agreement_id=#{agreementId}
-          and tt.task_type='36'
-          and tt.task_status='40'
-      ) AS subquery2
-      ON subquery1.type_id = subquery2.type_id
+    SELECT subquery1.type_id                                    as typeId,
+           subquery1.typeName                                      typeCode,
+           subquery1.typeNames                                  as typeName,
+           subquery1.out_num - COALESCE(subquery2.audit_num, 0) AS num,
+           subquery1.ma_code                                    as maCode
+    FROM (
+           -- 第一个查询作为子查询
+           SELECT mt.type_id,
+                  mt.type_name                              as typeName,
+                  CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames,
+                  lod.out_num,
+                  mm.ma_code
+           FROM tm_task_agreement tta
+                  LEFT JOIN lease_apply_info lai on lai.task_id = tta.task_id
+                  LEFT JOIN lease_out_details lod on lod.parent_id = lai.id
+                  LEFT JOIN ma_type mt on mt.type_id = lod.type_id
+                  LEFT JOIN tm_task tt on tt.task_id = tta.task_id
+                  LEFT JOIN ma_type mt1 ON mt1.type_id = lod.type_id
+                  LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+                  LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
+                  LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+                  LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
+           WHERE tta.agreement_id = '11'
+             and tt.task_type = '29'
+         ) AS subquery1
+           LEFT JOIN
+         (
+           -- 第二个查询作为子查询
+           SELECT mt.type_id,
+                  mt.type_name,
+                  CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames,
+                  bad.audit_num
+           FROM tm_task tt
+                  LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id
+                  LEFT JOIN back_apply_info bai on bai.task_id = tta.task_id
+                  LEFT JOIN back_apply_details bad on bad.parent_id = bai.id
+                  LEFT JOIN ma_type mt on mt.type_id = bad.type_id
+                  LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
+                  LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+                  LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
+                  LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+           WHERE tta.agreement_id = '11'
+             and tt.task_type = '36'
+         ) AS subquery2
+         ON subquery1.type_id = subquery2.type_id
   </select>
 
   <select id="view" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">

From 30f1d426351443cf488007c6c415c41715d93943 Mon Sep 17 00:00:00 2001
From: sliang <1589399930@qq.com>
Date: Thu, 21 Dec 2023 11:07:51 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9B=E7=BB=B4=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/base/api/domain/TmTask.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
index f631586e..daddaba5 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
@@ -135,4 +135,18 @@ public class TmTask implements Serializable {
     private String directAuditBy;
     private String directAuditTime;
     private String directAuditRemark;
+
+    @ApiModelProperty(value="往来单位id")
+    private Long unitId;
+    @ApiModelProperty(value="工程id")
+    private Long projectId;
+    @ApiModelProperty(value="关键字")
+    private String keyWord;
+    @ApiModelProperty(value="开始时间")
+    private String startTime;
+    @ApiModelProperty(value="结束时间")
+    private String endTime;
+    @ApiModelProperty(value="类型")
+    private Integer types;
+
 }
\ No newline at end of file

From 4524eb173fe0dd73d357568d913c2e2a49e69363 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 11:12:12 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SelectController.java   |  6 ++++++
 .../bonus/sgzb/system/domain/AgreementVo.java | 17 +++++++++++++++
 .../bonus/sgzb/system/domain/SelectDto.java   |  6 ++++++
 .../sgzb/system/mapper/SelectMapper.java      | 10 +++++++++
 .../sgzb/system/service/SelectService.java    |  9 ++++++++
 .../service/impl/SelectServiceImpl.java       | 21 ++++++++++++++++---
 .../resources/mapper/system/SelectMapper.xml  |  7 +++++++
 7 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
index 5b237c54..8c2c0888 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
@@ -111,4 +111,10 @@ public class SelectController {
     public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){
         return service.getUserByRoleIdCbx(dto);
     }
+
+    @ApiOperation(value = "往来单位id和标段工程id获取协议信息")
+    @PostMapping("getAgreementInfoById")
+    public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){
+        return service.getAgreementInfoById(dto);
+    }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java
new file mode 100644
index 00000000..35556031
--- /dev/null
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/AgreementVo.java
@@ -0,0 +1,17 @@
+package com.bonus.sgzb.system.domain;
+
+import lombok.Data;
+
+/**
+ * @author 10488
+ * 协议信息
+ */
+@Data
+public class AgreementVo {
+
+    /** 协议ID*/
+    private Integer agreementId;
+
+    /** 协议编号*/
+    private String agreementCode;
+}
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java
index 82de6cc1..400c100b 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java
@@ -25,4 +25,10 @@ public class SelectDto {
     /** 角色权限字符串*/
     private String roleKey;
 
+    /** 往来单位id*/
+    private int unitId;
+
+    /** 标段工程id*/
+    private int projectId;
+
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java
index a592475d..e6c92b69 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.system.mapper;
 
+import com.bonus.sgzb.system.domain.AgreementVo;
 import com.bonus.sgzb.system.domain.SelectDto;
 import com.bonus.sgzb.system.domain.SelectVo;
 import com.bonus.sgzb.system.domain.TreeNode;
@@ -156,4 +157,13 @@ public interface SelectMapper {
      * @date 2023/12/20 21:02
      */
     List<TreeNode> getUserByRoleIdCbxTree(SelectDto dto);
+
+    /**
+     * @param dto
+     * @return AgreementVo
+     * @description 往来单位id和标段工程id获取协议信息
+     * @author cwchen
+     * @date 2023/12/21 10:53
+     */
+    List<AgreementVo> getAgreementInfoById(SelectDto dto);
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java
index d937b1d1..2fad6250 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java
@@ -143,4 +143,13 @@ public interface SelectService {
      * @date 2023/12/20 20:48
      */
     AjaxResult getUserByRoleIdCbx(SelectDto dto);
+
+    /**
+     * @param dto
+     * @return AjaxResult
+     * @description 往来单位id和标段工程id获取协议信息
+     * @author cwchen
+     * @date 2023/12/21 10:47
+     */
+    AjaxResult getAgreementInfoById(SelectDto dto);
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
index b390ae75..6ab76e7e 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.system.service.impl;
 
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.system.domain.AgreementVo;
 import com.bonus.sgzb.system.domain.SelectDto;
 import com.bonus.sgzb.system.domain.SelectVo;
 import com.bonus.sgzb.system.domain.TreeNode;
@@ -212,12 +213,12 @@ public class SelectServiceImpl implements SelectService {
     @Override
     public AjaxResult getUserByRoleIdCbx(SelectDto dto) {
         try {
-            if(Objects.equals("1",dto.getType())){
+            if (Objects.equals("1", dto.getType())) {
                 // 用户/维修员/库管员/采购员-下拉选
                 List<SelectVo> list = new ArrayList<>();
                 list = mapper.getUserByRoleIdCbxSelect(dto);
                 return AjaxResult.success(list);
-            }else if(Objects.equals("2",dto.getType())){
+            } else if (Objects.equals("2", dto.getType())) {
                 List<TreeNode> groupList = new ArrayList<>();
                 List<TreeNode> list = new ArrayList<>();
                 // 用户/维修员/库管员/采购员-树
@@ -231,8 +232,22 @@ public class SelectServiceImpl implements SelectService {
                 return AjaxResult.success(groupList);
             }
         } catch (Exception e) {
-            log.error("用户/维修员/库管员/采购员-查询失败",e);
+            log.error("用户/维修员/库管员/采购员-查询失败", e);
         }
         return AjaxResult.success(null);
     }
+
+    @Override
+    public AjaxResult getAgreementInfoById(SelectDto dto) {
+        AgreementVo vo = new AgreementVo();
+        try {
+            List<AgreementVo> list = mapper.getAgreementInfoById(dto);
+            if (CollectionUtils.isNotEmpty(list)) {
+                vo = list.get(0);
+            }
+        } catch (Exception e) {
+            log.error("往来单位id和标段工程id获取协议信息", e);
+        }
+        return AjaxResult.success(vo);
+    }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index 68d09f3c..f6af78d1 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -174,4 +174,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0'
         WHERE sr.role_key = #{roleKey} AND sr.del_flag = '0'
     </select>
+    <!--往来单位id和标段工程id获取协议信息-->
+    <select id="getAgreementInfoById" resultType="com.bonus.sgzb.system.domain.AgreementVo">
+        SELECT agreement_id AS agreementId,
+               agreement_code AS agreementCode
+        FROM bm_agreement_info
+        WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
+    </select>
 </mapper>
\ No newline at end of file

From 2f6f9ec8626d8bc5644e48f57a7dd3402a8dbe99 Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Thu, 21 Dec 2023 12:04:38 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=94=B3=E9=A2=86=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/controller/TmTaskController.java | 39 +++++++++++++++++++
 .../bonus/sgzb/app/mapper/TmTaskMapper.java   |  9 ++++-
 .../bonus/sgzb/app/service/TmTaskService.java |  6 +--
 .../app/service/impl/TmTaskServiceImpl.java   | 13 ++++++-
 .../resources/mapper/app/TmTaskMapper.xml     | 29 ++++++--------
 5 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
index f4425980..af8df7f3 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
@@ -50,6 +50,18 @@ public class TmTaskController extends BaseController {
         return toAjax(tmTaskService.updateLeaseTaskAuditInfo(task));
     }
 
+    /**
+     * 根据任务id删除任务表及任务信息
+     */
+    @Log(title = "删除任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{taskId}")
+    public AjaxResult deleteTaskInfoByTaskId(@PathVariable String taskId) {
+        if (StringUtils.isEmpty(taskId)) {
+            return AjaxResult.error("参数错误，删除失败!");
+        }
+        return tmTaskService.deleteByPrimaryKey(taskId);
+    }
+
 
     /**
      * 往来单位提交工程领用机具信息
@@ -217,6 +229,33 @@ public class TmTaskController extends BaseController {
         return AjaxResult.success(getDataTable(leaseAuditList));
     }
 
+    /**
+     * 修改任务信息
+     */
+    @Log(title = "修改任务信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody TmTask task) {
+        if (StringUtils.isNull(task)) {
+            return AjaxResult.error("参数错误,传入信息为空!");
+        }
+        try {
+            // 任务编号
+            String taskId = task.getId();
+            // 任务类型
+            Integer taskType = task.getTaskType();
+            // 任务状态
+            Integer taskStatus = task.getTaskStatus();
+            int taskResult = tmTaskService.updateByPrimaryKeySelective(task);
+            if (taskResult > 0) {
+                return AjaxResult.success("任务表修改成功");
+            } else {
+                return AjaxResult.error("任务表修改失败");
+            }
+        } catch (Exception e) {
+            return AjaxResult.error("修改失败,异常信息:" + e.getMessage());
+        }
+    }
+
     /**
     * 通过主键查询单条数据
     *
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
index 88fe86c3..be5ef37d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
@@ -39,7 +39,9 @@ public interface TmTaskMapper {
     /** 更新leaseApplyDetails审批信息 */
     int updateLeaseApplyDetailsAuditInfo(@Param("record") LeaseApplyDetails record);
 
-    int deleteByPrimaryKey(Long taskId);
+    int deleteTaskByPrimaryKey(String taskId);
+
+    int deleteTaskInfoByTaskId(String taskId);
 
     int insert(TmTask record);
 
@@ -51,6 +53,11 @@ public interface TmTaskMapper {
 
     TmTask selectByPrimaryKey(Long taskId);
 
+    /**
+     * 修改Tm_task任务表
+     * @param record 参数对象
+     * @return 结果
+     */
     int updateByPrimaryKeySelective(TmTask record);
 
     int updateByPrimaryKey(TmTask record);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
index 516b0b86..5ba5f76c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
@@ -1,10 +1,10 @@
 package com.bonus.sgzb.app.service;
 
-import java.util.Date;
-import java.util.List;
 import com.bonus.sgzb.base.api.domain.TmTask;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,7 +23,7 @@ public interface TmTaskService{
 
     String genderLeaseCode();
 
-    int deleteByPrimaryKey(Long taskId);
+    AjaxResult deleteByPrimaryKey(String taskId);
 
     int createTask(TmTask record);
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 58d54ce2..064df67e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -8,6 +8,7 @@ import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
 import com.bonus.sgzb.base.api.domain.TmTask;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.core.utils.StringUtils;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -110,8 +111,16 @@ public class TmTaskServiceImpl implements TmTaskService{
     }
 
     @Override
-    public int deleteByPrimaryKey(Long taskId) {
-        return tmTaskMapper.deleteByPrimaryKey(taskId);
+    public AjaxResult deleteByPrimaryKey(String taskId) {
+        boolean taskFlag = tmTaskMapper.deleteTaskByPrimaryKey(taskId) > 0;
+        boolean infoFlag = tmTaskMapper.deleteTaskInfoByTaskId(taskId) > 0;
+        if (taskFlag && infoFlag) {
+            return AjaxResult.success("删除成功");
+        } else if (taskFlag || infoFlag) {
+            return AjaxResult.error("删除失败,任务表或信息表未删除!");
+        } else {
+            return AjaxResult.error("删除失败，请检查任务ID是否正确!!");
+        }
     }
 
     @Override
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 2d894e7e..ce87dd1b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -27,14 +27,20 @@
     from tm_task
     where task_id = #{taskId,jdbcType=BIGINT}
   </select>
+
   <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
       select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType}
   </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from tm_task
+  <update id="deleteTaskByPrimaryKey" parameterType="java.lang.Long">
+    update tm_task set `status` = '0'
     where task_id = #{taskId,jdbcType=BIGINT}
-  </delete>
+  </update>
+
+  <update id="deleteTaskInfoByTaskId" parameterType="java.lang.Long">
+    update lease_apply_info set `status` = '0'
+    where task_id = #{taskId}
+  </update>
 
   <insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
     insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id)
@@ -101,7 +107,6 @@
   </insert>
 
   <update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.base.api.domain.TmTask">
-    <!--@mbg.generated-->
     update tm_task
     <set>
       <if test="taskType != null">
@@ -110,15 +115,6 @@
       <if test="taskStatus != null">
         task_status = #{taskStatus,jdbcType=INTEGER},
       </if>
-      <if test="code != null and code != ''">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null and createBy != ''">
-        create_by = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="updateBy != null and updateBy != ''">
         update_by = #{updateBy,jdbcType=VARCHAR},
       </if>
@@ -128,9 +124,6 @@
       <if test="remark != null and remark != ''">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyId != null">
-        company_id = #{companyId,jdbcType=INTEGER},
-      </if>
     </set>
     where task_id = #{taskId,jdbcType=BIGINT}
   </update>
@@ -457,7 +450,7 @@
       LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
       LEFT JOIN bm_project_info bpi ON bpi.pro_id = bai.project_id
     WHERE
-      tt.task_type = '29'
+      tt.task_type = '29' and tt.status = '1'
       <if test="record.taskId != null and record.taskId != '' ">
         AND tt.task_id = #{record.taskId}
       </if>
@@ -469,7 +462,7 @@
     FROM
       lease_apply_info lai
     WHERE
-      lai.task_id = #{record.taskId} AND lai.`code` = #{record.code}
+      lai.task_id = #{record.taskId} AND lai.`code` = #{record.code} AND lai.status = '1'
   </select>
 
   <select id="getLeaseApplyDetails" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails">

From f689436364fb5403c23d083d0bebe866aa614899 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 13:26:41 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/utils/DateTimeHelper.java     | 16 +++++++++++--
 .../controller/LargeScreenController.java     |  5 ++++
 .../domain/MaintenanceWarningVo.java          | 23 +++++++++++++++++++
 .../largeScreen/mapper/LargeScreenMapper.java |  9 ++++++++
 .../service/ILargeScreenService.java          |  8 +++++++
 .../service/impl/LargeScreenServiceImpl.java  | 16 ++++++++++++-
 .../mapper/largeScreen/LargeScreenMapper.xml  | 15 ++++++++++++
 7 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java

diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
index f956153b..3c0d1165 100644
--- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
+++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
@@ -645,6 +645,16 @@ public class DateTimeHelper {
         return sdf.format(afterDate);
     }
 
+    public static String getTimeAfterThirtyDay() {
+        SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //制定日期格式
+        Calendar c=Calendar.getInstance();
+        Date date=new Date();
+        c.setTime(date);
+        c.add(Calendar.MONTH,1); //将当前日期加一个月
+        String validityDate=df.format(c.getTime()); //返回String型的时间
+        return validityDate;
+    }
+
     /**
      * 获取时间戳
      */
@@ -741,8 +751,10 @@ public class DateTimeHelper {
     }
 
     public static void main(String[] args) {
-        System.err.println(getFisrtDayOfMonth(2023,11));
-        System.err.println(getLastDayOfMonth(2023,11));
+//        System.err.println(getFisrtDayOfMonth(2023,11));
+//        System.err.println(getLastDayOfMonth(2023,11));
+        System.err.println(getTimeAfterThirtyDay());
+        System.err.println(getNowTime());
     }
 
     /**
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java
index 2f242d6f..049b5909 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java
@@ -83,4 +83,9 @@ public class LargeScreenController extends BaseController {
         return service.getCarUseByMonth();
     }
 
+    @Log(title = "检修预警", businessType = BusinessType.QUERY)
+    @PostMapping("getMaintenanceWarning")
+    public AjaxResult getMaintenanceWarning() {
+        return service.getMaintenanceWarning();
+    }
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java
new file mode 100644
index 00000000..fc02c14e
--- /dev/null
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java
@@ -0,0 +1,23 @@
+package com.bonus.sgzb.largeScreen.domain;
+
+import lombok.Data;
+
+/**
+ * @author 10488
+ * 检修预警-vo
+ */
+@Data
+public class MaintenanceWarningVo {
+
+    /** 机具名称*/
+    private String machineName;
+
+    /** 机具编号*/
+    private String maCode;
+
+    /** 规格型号*/
+    private String typeName;
+
+    /** 下次检修日期*/
+    private String nextCheckTime;
+}
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
index c3e9dd29..c387cbee 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
@@ -92,4 +92,13 @@ public interface LargeScreenMapper {
      * @date 2023/12/15 18:57
      */
     List<ScrapAnalysisVo> getTotalOwnership(ParamsDto dto);
+
+    /**
+     * @param dto
+     * @return List<MaintenanceWarningVo>
+     * @description 检修预警
+     * @author cwchen
+     * @date 2023/12/21 9:53
+     */
+    List<MaintenanceWarningVo> getMaintenanceWarning(ParamsDto dto);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java
index aed55273..a52493e9 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java
@@ -88,4 +88,12 @@ public interface ILargeScreenService {
      * @date 2023/12/13 15:40
      */
     AjaxResult getCarUseByMonth();
+
+    /**
+     * @return AjaxResult
+     * @description 检修预警
+     * @author cwchen
+     * @date 2023/12/21 9:42
+     */
+    AjaxResult getMaintenanceWarning();
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
index 229df537..d836756c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
@@ -103,7 +103,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
      * @author cwchen
      * @date 2023/12/15 19:33
      */
-    public TotalOwnershipVo countNum(String maType,String maTypeName) {
+    public TotalOwnershipVo countNum(String maType, String maTypeName) {
         TotalOwnershipVo vo = new TotalOwnershipVo();
         ParamsDto dto = new ParamsDto();
         dto.setMaType(maType);
@@ -317,6 +317,20 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         list.add(carUseVo6);
         return AjaxResult.success(list);
     }
+
+    @Override
+    public AjaxResult getMaintenanceWarning() {
+        List<MaintenanceWarningVo> list = new ArrayList<>();
+        try {
+            ParamsDto dto = new ParamsDto();
+            dto.setStartDate(DateTimeHelper.getNowTime());
+            dto.setEndDate(DateTimeHelper.getTimeAfterThirtyDay());
+            list = mapper.getMaintenanceWarning(dto);
+        } catch (Exception e) {
+            log.error("检修预警-查询失败",e);
+        }
+        return AjaxResult.success(list);
+    }
 }
 
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index f459a440..aa12ab69 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -347,4 +347,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </if>
         </if>
     </select>
+    <!--检修预警-->
+    <select id="getMaintenanceWarning" resultType="com.bonus.sgzb.largeScreen.domain.MaintenanceWarningVo">
+        SELECT mm.ma_code AS maCode,
+               a.typeName,
+               a.typeName2 AS machineName,
+               mm.next_check_time
+        FROM ma_machine mm
+        LEFT JOIN (
+            SELECT mt.type_id,mt.type_name AS typeName,mt2.type_name AS typeName2
+            FROM ma_type mt
+            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
+            WHERE mt.`level` = '4'
+        )a ON mm.type_id = a.type_id
+        WHERE mm.next_check_time BETWEEN #{startDate} AND #{endDate}
+    </select>
 </mapper>
\ No newline at end of file

From b13f6e787fe501a0353b2b321942fc8646fe3a57 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Thu, 21 Dec 2023 13:31:29 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackApplyMapper.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 00a7303e..15bd83be 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -269,7 +269,12 @@
            )
   </insert>
     <update id="audit">
-      UPDATE tm_task SET task_status = 38 WHERE task_id = #{id}
+      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 tt.task_status = '38',bad.audit_num=bad.pre_num
+      WHERE
+        bai.id = #{id}
     </update>
     <delete id="del">
     DELETE FROM back_apply_info WHERE id = #{id}
@@ -358,7 +363,7 @@
                   LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
                   LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
                   LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
-           WHERE tta.agreement_id = '11'
+           WHERE tta.agreement_id = #{agreementId}
              and tt.task_type = '29'
          ) AS subquery1
            LEFT JOIN
@@ -377,7 +382,7 @@
                   LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
                   LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
                   LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
-           WHERE tta.agreement_id = '11'
+           WHERE tta.agreement_id = #{agreementId}
              and tt.task_type = '36'
          ) AS subquery2
          ON subquery1.type_id = subquery2.type_id

From debe5f88a2ded467d4c1911d7d31f53b79a30f08 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Thu, 21 Dec 2023 14:13:03 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
index cbf96d7b..19776a8b 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
@@ -3,7 +3,11 @@ server:
   port: 9201
 
 # Spring
-spring: 
+spring:
+  servlet:
+    multipart:
+      max-request-size: 10MB
+      max-file-size: 10MB
   application:
     # 应用名称
     name: sgzb-system

From d10f4ab05a06b88f3a9a61e6174fb2092226c31c Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Thu, 21 Dec 2023 14:14:05 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/base/api/domain/TmTask.java    | 10 +++++++++-
 .../src/main/resources/mapper/app/BackApplyMapper.xml  |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
index daddaba5..fb49a43c 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
@@ -129,11 +129,19 @@ public class TmTask implements Serializable {
     private List<LeaseApplyDetails>  leaseApplyDetails;
 
 
+    @ApiModelProperty(value="协议id")
     private Integer agreementId;
-    private Integer backPerson;
+    @ApiModelProperty(value="退料人")
+    private String backPerson;
+    @ApiModelProperty(value="退料人联系电话")
     private String phone;
+    @ApiModelProperty(value="退料申请时间")
+    private String backTime;
+    @ApiModelProperty(value="退料审核人")
     private String directAuditBy;
+    @ApiModelProperty(value="退料审核时间")
     private String directAuditTime;
+    @ApiModelProperty(value="退料审核备注")
     private String directAuditRemark;
 
     @ApiModelProperty(value="往来单位id")
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 15bd83be..d95d9f27 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -144,6 +144,9 @@
     <if test="backPerson != null and backPerson != ''">
       back_person,
     </if>
+    <if test="backTime != null and backTime != ''">
+      back_time,
+    </if>
     <if test="phone != null and phone != ''">
       phone,
     </if>
@@ -182,6 +185,9 @@
     <if test="backPerson != null and backPerson != ''">
       #{backPerson},
     </if>
+    <if test="backTime != null and backTime != ''">
+      #{backTime},
+    </if>
     <if test="phone != null and phone != ''">
       #{phone},
     </if>
@@ -272,7 +278,7 @@
       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 tt.task_status = '38',bad.audit_num=bad.pre_num
+      SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
       WHERE
         bai.id = #{id}
     </update>

From 7d27c3407266d88f2613aef2d0cc5df54d83988d Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 16:24:46 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/sgzb/system/domain/TreeNode.java | 3 +++
 .../src/main/resources/mapper/system/SelectMapper.xml        | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
index 01b73bd7..a69aaa12 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
@@ -19,6 +19,9 @@ public class TreeNode {
 
     private long parentId;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String level;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index f6af78d1..4f7ef4fa 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -129,14 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT pro_id AS id,
                pro_name AS `name`
         FROM bm_project_info
-        WHERE del_flag = '0'
+        WHERE del_flag = '0' AND status = '0'
         ORDER BY create_time
     </select>
     <!--配件所属上级树-->
     <select id="getAccessoryTree" resultType="com.bonus.sgzb.system.domain.TreeNode">
         SELECT pa_id AS id,
                pa_name AS label,
-               parent_id AS parentId
+               parent_id AS parentId,
+               level
         FROM ma_part_type
         WHERE del_flag = '0'
         ORDER BY create_time

From 31ffacfc0431124668bea435c979d267d731b769 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 16:34:28 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=A0=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/sgzb/system/domain/TreeNode.java   | 3 +++
 .../src/main/resources/mapper/system/SelectMapper.xml          | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
index a69aaa12..b723e1a3 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
@@ -22,6 +22,9 @@ public class TreeNode {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String level;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String unitName;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index 4f7ef4fa..7cafc185 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -92,7 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getDeviceTypeTree" resultType="com.bonus.sgzb.system.domain.TreeNode">
         SELECT type_id AS id,
                type_name AS label,
-               parent_id AS parentId
+               parent_id AS parentId,
+               unit_name AS unitName
         FROM ma_type
         WHERE del_flag = '0'
         <if test="level!=null and level!=''">