From b807d2644011c6b6c14332d0bb120843b2ef6985 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 25 八月 2024 15:17:13 +0800
Subject: [PATCH] 工单优化

---
 ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java                            |    2 +
 ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java |    4 +-
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java          |   12 +++---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml         |    3 +
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java       |   19 +++++----
 ycl-server/src/main/resources/application-dev.yml                                      |    8 ++-
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java     |    6 +-
 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java                |    8 ++--
 8 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
index 11e52d4..dff8d5f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -23,6 +24,7 @@
     /**
      * 鍒涘缓鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "create_time",fill = FieldFill.INSERT)
     private Date createTime;
 
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
index ad21639..ff225ff 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
@@ -22,9 +22,9 @@
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("宸ュ崟ID")
-    @TableField("work_order_id")
-    private Integer workOrderId;
+    @ApiModelProperty("宸ュ崟鍙�")
+    @TableField("work_order_no")
+    private String workOrderNo;
 
     @ApiModelProperty("瀹℃牳浜�")
     @TableField("auditing_user")
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index 428d483..6c0fe66 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -69,16 +69,16 @@
         return workOrderService.ywCondition(form);
     }
 
-    @GetMapping("/yw-condition/{id}")
+    @GetMapping("/yw-condition/{workOrderNo}")
     @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
-    public Result ywCondition(@PathVariable Integer id) {
-        return workOrderService.selectYwConditionByYwId(id);
+    public Result ywCondition(@PathVariable String workOrderNo) {
+        return workOrderService.selectYwConditionByYwId(workOrderNo);
     }
 
-    @GetMapping("/yw-auditing-list/{id}")
+    @GetMapping("/yw-auditing-list/{workOrderNo}")
     @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
-    public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) {
-        return workOrderService.selectYwAuditingListByYwId(id);
+    public Result ywAuditingByYwId(@PathVariable String workOrderNo) {
+        return workOrderService.selectYwAuditingListByYwId(workOrderNo);
     }
 
     @PutMapping("/yw-result")
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
index fbad792..024a69a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
@@ -20,10 +20,10 @@
     /**
      * 鏍规嵁宸ュ崟ID鏌ヨ杩愮淮璁板綍
      *
-     * @param workOrderId
+     * @param workOrderNo
      * @return
      */
-    List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderId") Integer workOrderId);
+    List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderNo") String workOrderNo);
 
     /**
      * 鎵归噺鎻掑叆
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index fcaee48..edd2a15 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -129,17 +129,17 @@
 
     /**
      * 鑾峰彇宸ュ崟杩愮淮鎯呭喌
-     * @param id 宸ュ崟id
+     * @param workOrderNo 宸ュ崟鍙�
      * @return 宸ュ崟杩愮淮鎯呭喌
      */
-    Result selectYwConditionByYwId(Integer id);
+    Result selectYwConditionByYwId(String workOrderNo);
 
     /**
      * 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
-     * @param id 宸ュ崟id
+     * @param workOrderNo 宸ュ崟鍙�
      * @return 宸ュ崟杩愮淮瀹℃牳璁板綍
      */
-    Result selectYwAuditingListByYwId(String id);
+    Result selectYwAuditingListByYwId(String workOrderNo);
 
     /**
      * 鎵归噺涓嬪彂
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index b26d549..a668898 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -157,6 +157,7 @@
                     ywRecord.setCommitUser(1);
                     ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
                     ywRecord.setCreateTime(new Date());
+                    ywRecord.setSysMsg(Boolean.TRUE);
                     willAddMsg.add(ywRecord);
                 }
             } else {
@@ -300,7 +301,7 @@
         baseMapper.updateById(workOrder);
         // 娣诲姞涓�鏉″鏍歌褰�
         WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
-        workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
+        workOrderAuditingRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
         workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
         workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
         workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -331,18 +332,18 @@
         if (list.isEmpty()) {
             return Result.error("娌℃湁宸ュ崟鍙互瀹℃牳");
         }
-        List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList());
+        List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).collect(Collectors.toList());
         List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList();
         // 宸ュ崟鐘舵��
         LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.in(WorkOrder::getId, ids);
+        lambdaUpdateWrapper.in(WorkOrder::getWorkOrderNo, workOrderNoList);
         lambdaUpdateWrapper.set(WorkOrder::getStatus, form.getAuditingResult());
         baseMapper.update(lambdaUpdateWrapper);
         // 娣诲姞澶氭潯瀹℃牳璁板綍
         List<WorkOrderAuditingRecord> workOrderAuditingRecords = new ArrayList<>();
-        for (Integer id : ids) {
+        for (String workOrderNo : workOrderNoList) {
             WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
-            workOrderAuditingRecord.setWorkOrderId(id);
+            workOrderAuditingRecord.setWorkOrderNo(workOrderNo);
             workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
             workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
             workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -390,8 +391,8 @@
     }
 
     @Override
-    public Result selectYwConditionByYwId(Integer id) {
-        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+    public Result selectYwConditionByYwId(String workOrderNo) {
+        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
         ywConditionList.stream().forEach(item -> {
             if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
                 item.setCommitUserName("绯荤粺娑堟伅");
@@ -401,10 +402,10 @@
     }
 
     @Override
-    public Result selectYwAuditingListByYwId(String id) {
+    public Result selectYwAuditingListByYwId(String workOrderNo) {
         return Result.ok().data(
                 new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
-                        .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+                        .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
                         .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
                         .list());
     }
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 7f977fe..c88b4d7 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -36,7 +36,7 @@
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
-    url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
+    url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
     username: root
     password: ycl@202466
     type: com.alibaba.druid.pool.DruidDataSource
@@ -76,10 +76,12 @@
 spring.data:
   redis:
     # 鍦板潃
-    host: 42.193.1.25
+    #host: 42.193.1.25
+    host: 127.0.0.1
     # 绔彛锛岄粯璁や负6379
     port: 6379
-    password: ycl2018
+    #password: ycl2018
+    password:
     # 鏁版嵁搴撶储寮�
     database: 0
     # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
index 940786c..43dce5d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -9,13 +9,14 @@
         <result column="yw_condition" property="ywCondition"/>
         <result column="commit_user" property="commitUser"/>
         <result column="nick_name" property="commitUserName"/>
+        <result column="sys_msg" property="sysMsg"/>
         <result column="yw_proofMaterials" property="ywProofMaterials"/>
     </resultMap>
 
     <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
         SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
         FROM t_work_order_yw_condition_record yw
-                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderId}
+                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
         ORDER BY yw.create_time DESC
     </select>
 

--
Gitblit v1.8.0