From bb2469f1841e2ece4b2389c2da8397a221872a5b Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Fri, 14 Jun 2024 09:18:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E5=92=8C=E6=8A=A5=E5=BA=9F=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RepairAuditDetailsServiceImpl.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 94d907c3..8df93ff5 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -299,7 +299,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                                 for (int i = 0; i < fileIsList.length; i++) {
                                     SysFile  sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i]));
                                     //对获取的图片地址进行拼接
-                                    fileUrl.append(","+sysFile.getFileUrl());
+                                    if (i==fileIsList.length-1){
+                                        fileUrl.append(sysFile.getFileUrl());
+                                    }else {
+                                        fileUrl.append(sysFile.getFileUrl()+",");
+                                    }
                                 }
                                 scrapApplyDetails.setFileUrl(fileUrl.toString());
                                 scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);

From 960aa873992c67730d79ef54aff44d88faf70e94 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 14 Jun 2024 11:30:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolsAcceptance/component/queryTools.vue     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index 3ae4b098..97678653 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -159,14 +159,14 @@
                 width="180"
             >
                 <template slot-scope="scope">
-                    <span v-if="scope.row.status == 0">未验收</span>
-                    <span v-if="scope.row.status == 1">已验收</span>
-                    <span v-if="scope.row.status == 2">待通知</span>
-                    <span v-if="scope.row.status == 3">验收不通过</span>
-                    <span v-if="scope.row.status == 4">已审核</span>
-                    <span v-if="scope.row.status == 5">已审核</span>
-                    <span v-if="scope.row.status == 6">入库待审核</span>
-                    <span v-if="scope.row.status == 7">已审核</span>
+                  <span v-if="scope.row.status == 0">未验收</span>
+                  <span v-if="scope.row.status == 1">已验收</span>
+                  <span v-if="scope.row.status == 2">待通知</span>
+                  <span v-if="scope.row.status == 3">验收不通过</span>
+                  <span v-if="scope.row.status == 4">已入库</span>
+                  <span v-if="scope.row.status == 5">入库驳回</span>
+                  <span v-if="scope.row.status == 6">入库待审核</span>
+                  <span v-if="scope.row.status == 7">综合服务中心未通过</span>
                 </template>
             </el-table-column>
             <el-table-column

From deb1d7ad611d1ee2113ccad333d67142110b3454 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 14 Jun 2024 13:37:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 786ad5ff..8dc79719 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -175,21 +175,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
-        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
+        select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
                m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
                su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
                m.remark, m.company_id ,m.type_id id , m.type_name label
         from ma_type m
-        left join ma_prop_set mps on m.type_id = mps.type_id
-        left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
+        left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0'
+        left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0'
         left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
         left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
         left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
         left join sys_user su on mtk.user_id = su.user_id
         <where>
             m.status = '0'
+            and m.del_flag = '0'
             <if test="typeName != null and typeName !=''">
                 AND type_name like concat('%',#{typeName},'%')
             </if>

From fe70c92210e98d25cb892eb1e4d8369d5f0a5b53 Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Fri, 14 Jun 2024 13:48:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=9C=A8=E4=BB=BB=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E9=A2=86=E6=96=99=E5=92=8C=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=AD=98userId=EF=BC=8C=E5=AF=B9=E4=BB=A5=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/app/service/impl/TmTaskServiceImpl.java    | 2 ++
 .../src/main/resources/mapper/app/TmTaskMapper.xml        | 8 ++++----
 .../sgzb/material/controller/BackApplyController.java     | 2 ++
 .../com/bonus/sgzb/material/domain/BackApplyInfo.java     | 4 +++-
 .../sgzb/material/service/impl/BackApplyServiceImpl.java  | 6 ++++--
 5 files changed, 15 insertions(+), 7 deletions(-)

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 a061b7ce..8385f738 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
@@ -1093,6 +1093,8 @@ public class TmTaskServiceImpl implements TmTaskService {
 
     @Override
     public int insertSelective(TmTask record) {
+        //2024.06.14统一创建人存userId
+        record.setCreateBy(record.getUserId());
         return tmTaskMapper.insertSelective(record);
     }
 
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 e31e0935..efb6bb48 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
@@ -535,7 +535,7 @@
       tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
       bpl.lot_id as proId,bpl.lot_name as proName,
       bui.unit_id as unitId,bui.unit_name as unitName,
-      lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,tt.create_by as applyFor,d.`name` as taskName,
+      lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.user_name as applyFor,d.`name` as taskName,
       case when d.id = '31' then lai.company_audit_remark
       when d.id = '32' then lai.dept_audit_remark
       when d.id = '33' then lai.direct_audit_remark
@@ -548,7 +548,7 @@
       tt.create_time as createTimes, tt.update_time as updateTimes
       FROM
       tm_task tt
-      LEFT JOIN sys_user su ON tt.create_by = su.user_name
+      LEFT JOIN sys_user su ON tt.create_by = su.user_id
       LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
       LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
       LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
@@ -943,7 +943,7 @@
     tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,su.user_id as userId,
     bpl.lot_id as proId,bpl.lot_name as proName,
     bui.unit_id as unitId,bui.unit_name as unitName,
-    lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
+    lai.lease_person as leasePerson, lai.phone as leasePhone, su.user_name as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
     case when d.id = '31' then lai.company_audit_remark
     when d.id = '32' then lai.dept_audit_remark
     when d.id = '33' then lai.direct_audit_remark
@@ -956,7 +956,7 @@
     tt.create_time as createTimes, tt.update_time as updateTimes
     FROM
     tm_task tt
-    LEFT JOIN sys_user su ON tt.create_by = su.user_name
+    LEFT JOIN sys_user su ON tt.create_by = su.user_id
     LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
     LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
     LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index 5d0c6745..60bf20d1 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -193,6 +193,8 @@ public class BackApplyController extends BaseController {
                             BackApplyInfo backApplyInfo1 = leaseApplyDetailsList.get(0);
                             // 对领料任务表的对象做数据处理
                             BackApplyInfo backApplyInfo = bean.getBackApplyInfo();
+                            //创建人
+                            backApplyInfo.setCreateBy(bean.getUserId());
                             /* 创建领料单号*/
                             backApplyInfo.setCode(code);
                             /*设置任务ID*/
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
index 5d6f022d..480faef6 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
@@ -251,5 +251,7 @@ public class BackApplyInfo extends BaseEntity {
     private String time;
 
     private int viewWeb;
-
+    /** 创建者 */
+    @ApiModelProperty(value = "创建者Id")
+    private String userId;
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
index e966e19c..71b7a4cc 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
@@ -46,8 +46,8 @@ public class BackApplyServiceImpl implements BackApplyService {
             return backApplyMapper.getBackApplyList(bean);
         } else {
             //个人只能看到自己的申请的退料
-            String username = SecurityUtils.getLoginUser().getUsername();
-            bean.setCreateBy(username);
+            String userId = SecurityUtils.getLoginUser().getUserid().toString();
+            bean.setCreateBy(userId);
             return backApplyMapper.getBackApplyList(bean);
         }
     }
@@ -112,6 +112,8 @@ public class BackApplyServiceImpl implements BackApplyService {
 
     @Override
     public int insertSelective(BackApplyInfo bean) {
+        //2024.06.14创建人统一修改为用户id
+        bean.setCreateBy(bean.getUserId());
         return backApplyMapper.insertTask(bean);
     }
 

From 8c78471e2fa5b48c28d38f5226290773506882ae Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 14 Jun 2024 16:17:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=97=B6?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/system/service/impl/SysSmsServiceImpl.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
index 8a76cda2..002ed730 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
@@ -23,6 +23,9 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
@@ -162,8 +165,14 @@ public class SysSmsServiceImpl implements ISysSmsService {
             } else {
                 sendCount++;
             }
+            // 获取当前日期和时间
+            LocalDateTime now = LocalDateTime.now();
+            // 获取当天午夜时间
+            LocalDateTime midnight = LocalDateTime.of(now.toLocalDate(), LocalTime.MIDNIGHT).plusDays(1);
+            // 计算当前时间到当天午夜的时间差（秒）
+            long secondsUntilMidnight = now.until(midnight, ChronoUnit.SECONDS);
             //存储一天手机号发送验证码数据
-            redisService.setCacheObject(key, sendCount, 1L, TimeUnit.DAYS);
+            redisService.setCacheObject(key, sendCount, secondsUntilMidnight, TimeUnit.SECONDS);
             return success("手机号：" + phone + "，短信验证码发送成功 ！");
         } catch (Exception e) {
             return AjaxResult.error("发送失败:" + e.getMessage());