From 738f842a30c46755f7f7d3bceac8b5b9df5cd2dd Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 13 Aug 2024 17:45:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=91=A8=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/base/domain/BmProjectInfo.java   | 6 ++++++
 .../java/com/bonus/sgzb/base/domain/BmProjectLot.java    | 6 ++++++
 .../main/resources/mapper/base/BmProjectInfoMapper.xml   | 6 ++++++
 .../main/resources/mapper/base/BmProjectLotMapper.xml    | 9 ++++++++-
 .../sgzb/material/mapper/ScrapApplyDetailsMapper.java    | 1 +
 .../service/impl/InventoryAndWarehousingServiceImpl.java | 2 +-
 .../service/impl/ScrapApplyDetailsServiceImpl.java       | 5 +++++
 .../mapper/material/RepairAuditDetailsMapper.xml         | 2 +-
 .../mapper/material/ScrapApplyDetailsMapper.xml          | 5 +++++
 .../resources/mapper/material/SltAgreementInfoMapper.xml | 4 ++--
 10 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
index e3eb3fb8..36e9cd50 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
@@ -79,6 +79,12 @@ public class BmProjectInfo {
   @Excel(name = "工程类型")
   @ApiModelProperty(value = "工程类型名称")
   private String typeName;
+  @ApiModelProperty(value = "经度")
+  private String longitude;
+  @ApiModelProperty(value = "纬度")
+  private String latitude;
+  @ApiModelProperty(value = "地址")
+  private String address;
 
   /** 导出选中列表 */
   private List<Long> dataCondition;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
index 8a5e2ffc..4182db30 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
@@ -141,6 +141,12 @@ public class BmProjectLot {
     @Excel(name = "工程类型")
     @ApiModelProperty(value = "工程类型名称")
     private String typeName;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+    @ApiModelProperty(value = "地址")
+    private String address;
 
     /** 导出选中列表 */
     private List<Long> dataCondition;
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml
index 023ab8ff..9827ec04 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml
@@ -167,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id,</if>
             <if test="startDate != null and startDate != ''">start_date,</if>
             <if test="completionDate != null and completionDate != ''">completion_date,</if>
+            <if test="longitude != null and longitude != ''">longitude,</if>
+            <if test="latitude != null and latitude != ''">latitude,</if>
+            <if test="address != null and address != ''">address,</if>
             create_time
         )values(
 			<if test="proName != null and proName != ''">#{proName},</if>
@@ -182,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="startDate != null and startDate != ''">#{startDate},</if>
             <if test="completionDate != null and completionDate != ''">#{completionDate},</if>
+            <if test="longitude != null and longitude != ''">#{longitude},</if>
+            <if test="latitude != null and latitude != ''">#{latitude},</if>
+            <if test="address != null and address != ''">#{address},</if>
             sysdate()
 		)
     </insert>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
index 405ffc9d..f6f2a204 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
@@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getProjectLotAll"  parameterType="com.bonus.sgzb.base.domain.BmProjectLot" resultMap="BmProjectLotResult">
         <!--<include refid="bmProjectInfo"/>-->
         select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share,
-        a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date
+        a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date,
+        a.longitude,a.latitude,a.address
         from bm_project_lot a
         left join sys_dept b on a.dept_id = b.dept_id
         left join sys_dic c on a.type_id = c.id
@@ -117,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id,</if>
             <if test="startDate != null and startDate != ''">start_date,</if>
             <if test="completionDate != null and completionDate != ''">completion_date,</if>
+            <if test="longitude != null and longitude != ''">longitude,</if>
+            <if test="latitude != null and latitude != ''">latitude,</if>
+            <if test="address != null and address != ''">address,</if>
             create_time
         )values(
 			<if test="lotName != null and lotName != ''">#{lotName},</if>
@@ -134,6 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="startDate != null and startDate != ''">#{startDate},</if>
             <if test="completionDate != null and completionDate != ''">#{completionDate},</if>
+            <if test="longitude != null and longitude != ''">#{longitude},</if>
+            <if test="latitude != null and latitude != ''">#{latitude},</if>
+            <if test="address != null and address != ''">#{address},</if>
             sysdate()
 		)
     </insert>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
index 80996ac2..a39456ec 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
@@ -163,6 +163,7 @@ public interface ScrapApplyDetailsMapper {
      * @return
      */
     int updateStatus(ScrapApplyDetails bean);
+    int updateStatusThree(ScrapApplyDetails bean);
 
     String getRepairId(ScrapApplyDetails scrapApplyDetails);
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
index 6df67528..bea8e556 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
@@ -92,7 +92,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
         //判断提交表单中是否存在相同编码
         for (int i = 0; i < machIneDtoList.size() - 1; i++) {
             for (int j = i + 1; j < machIneDtoList.size(); j++) {
-                if (machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
+                if (StringUtils.isNotBlank(machIneDtoList.get(i).getMaCode()) && StringUtils.isNotBlank(machIneDtoList.get(j).getMaCode()) && machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
                     throw new ServiceException("列表中包含以下相同的设备编码，请修改后重新提交：" + machIneDtoList.get(i).getMaCode());
                 }
             }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
index 886059b0..1d147af3 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
@@ -369,6 +369,11 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
             } else {
                 task.setTaskStatus(Integer.valueOf(TaskStatusEnum.SCRAP_PASSED.getCode()));
                 task.setDisposition(Integer.valueOf(TaskStatusEnum.NOT_DISPOSED.getCode()));
+                // 修改scrap_apply_details表状态
+                ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
+                scrapApplyDetails.setStatus("3");
+                scrapApplyDetails.setTaskId(scrapAuditorSet.getTaskId().longValue());
+                scrapApplyDetailsMapper.updateStatusThree(scrapApplyDetails);
             }
             //修改任务状态
             taskMapper.updateTmTask(task);
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
index 07df6e35..4fed9f44 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateRepairCost">
         update repair_cost
-        set part_type = #{status}
+        set part_type = #{status},status = '3'
         where repair_id = #{inputDetails.repairId}
     </update>
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
index d6589e0f..5e2853db 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
@@ -662,6 +662,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SET num = (IFNULL(num, 0)) + #{backNum}
         WHERE type_id = #{typeId}
     </update>
+    <update id="updateStatusThree">
+        update scrap_apply_details
+        set status = #{status}
+        where task_id = #{taskId}
+    </update>
 
     <select id="selectTypeNameByTaskId" resultType="java.lang.String">
         select GROUP_CONCAT(type_name) typeName from
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
index af65b641..ef30d645 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
         left join ma_type mt on rc.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
-        where rc.status in ('0','1')
+        where rc.status in ('3')
         <if test="taskList != null and taskList.size() > 0">
             and rc.task_id in
             <foreach item="task" collection="taskList" open="(" separator="," close=")">
@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
         left join ma_type mt on sad.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
-        where 1=1
+        where 1=1 and sad.status = '3'
         <if test="taskList != null and taskList.size() > 0">
             and sad.task_id in
             <foreach item="task" collection="taskList" open="(" separator="," close=")">

From fbf124d1d446c7a38882d588b954118c95cd33c1 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 13 Aug 2024 18:09:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/BmProjectLotMapper.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
index f6f2a204..f70840f9 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
@@ -162,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
             <if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
             <if test="completionDate != null and completionDate != ''">completion_date = #{completionDate},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
             update_time = sysdate()
         </set>
         where lot_id = #{lotId}