From 351bcbfb12346c5ab256f47e07a9ac1cbd83356f Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 4 Jun 2024 09:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BackApplyServiceImpl.java    |  8 +++----
 .../resources/mapper/app/TmTaskMapper.xml     | 21 +++++++++++--------
 .../sgzb/material/domain/MachIneDto.java      | 11 ----------
 .../InventoryAndWarehousingMapper.xml         |  3 ---
 4 files changed, 16 insertions(+), 27 deletions(-)

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 2849a578..0b19f246 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
@@ -180,15 +180,15 @@ public class BackApplyServiceImpl implements BackApplyService {
         record.setCreateBy(userid.toString());
         if(roles.contains("admin")){
             record.setStatus("2");
-            return backApplyMapper.refuse(record);
+            backApplyMapper.refuse(record);
         }
         if (companyId != null && companyId == 101) {
             record.setStatus("2");
-            return backApplyMapper.refuse(record);
+            backApplyMapper.refuse(record);
         }
         if (companyId != null && companyId == 102) {
             record.setStatus("4");
-            return backApplyMapper.refuse(record);
+            backApplyMapper.refuse(record);
         }
         List<Integer> taskIdById = backApplyMapper.getTaskIdById(record);
         if (CollUtil.isNotEmpty(taskIdById)) {
@@ -202,7 +202,7 @@ public class BackApplyServiceImpl implements BackApplyService {
             record.setTaskStatus("101");
             backApplyMapper.updateTmTask(record);
         }
-        return 0;
+        return 1;
     }
 
 }
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 f63ea7e1..fdf4d3b2 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
@@ -615,18 +615,21 @@
   </select>
   <select id="getLeaseApplyManageDetails" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
     SELECT
-        lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
-        case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
-        mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
+    lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
+    case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
+    mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
     FROM
-        lease_apply_details lad
-        LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
-        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
-        LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
+    lease_apply_details lad
+    LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
+    LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+    LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
     WHERE
-        lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
+    lad.parennt_id = #{record.id}
+    <if test="record.companyId != null and record.companyId != ''">
+      AND lad.company_id = #{record.companyId}
+    </if>
     GROUP BY
-      lad.id
+    lad.id
   </select>
 
     <select id="selectNumByMonth" resultType="java.lang.Integer">
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
index 896b01bb..04a46739 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
@@ -141,15 +141,4 @@ public class MachIneDto {
     @ApiModelProperty(value = "表单集合入库数量")
     private Double putInStoreNum;
 
-    /**
-     * 单位名称
-     */
-    @ApiModelProperty(value = "单位名称")
-    private String unitId;
-
-    /**
-     * 工程名称
-     */
-    @ApiModelProperty(value = "工程名称")
-    private String proId;
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
index 6cb5d133..de24b8d4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
@@ -211,7 +211,4 @@
     <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
         select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
     </select>
-    <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
-        select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
-    </select>
 </mapper>
\ No newline at end of file