From 3adef49c200a46e855682955bfe4d1367f909378 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 19 Oct 2022 16:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E6=8F=90=E6=A1=88=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImprovementProposalsController.java        | 14 +++++++++++---
 .../anomaly/model/ImprovementProposals.java    |  4 ++++
 .../service/impl/TemporaryFixServiceImpl.java  |  6 ++++++
 .../mapper/ImprovementProposalsMapper.xml      | 18 +++++++++++++++++-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ImprovementProposalsController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ImprovementProposalsController.java
index 58434443..1bc614a2 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ImprovementProposalsController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ImprovementProposalsController.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.anomaly.controller;
 
+import com.foreverwin.mesnac.anomaly.mapper.ImprovementProposalsMapper;
 import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
 import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
 import com.foreverwin.mesnac.common.util.StringUtil;
@@ -36,6 +37,9 @@ public class ImprovementProposalsController {
     @Autowired
     FileUploadedService fileUploadedService;
 
+    @Autowired
+    private ImprovementProposalsMapper improvementProposalsMapper;
+
     /**
      * 根据id查询
      *
@@ -67,7 +71,7 @@ public class ImprovementProposalsController {
                 .like(!StringUtil.isBlank(paramMap.get("sequenceCode")), "SEQUENCE_CODE", paramMap.get("sequenceCode"))
                 .ge(!StringUtil.isBlank(paramMap.get("startDate")), "CREATED_TIME", DateReportUtils.stringToDate(paramMap.get("startDate") + " 00:00:00", "yyyy-MM-dd HH:mm:ss"))
                 .le(!StringUtil.isBlank(paramMap.get("endDate")), "CREATED_TIME", DateReportUtils.stringToDate(paramMap.get("endDate") + " 23:59:59", "yyyy-MM-dd HH:mm:ss"))
-
+                .isNull("IS_DELETE")
         ;
         result = improvementProposalsService.list(queryWrapper);
         return R.ok(result);
@@ -93,7 +97,7 @@ public class ImprovementProposalsController {
                 .like(!StringUtil.isBlank(paramMap.get("sequenceCode")), "SEQUENCE_CODE", paramMap.get("sequenceCode"))
                 .ge(!StringUtil.isBlank(paramMap.get("startDate")), "CREATED_TIME", DateReportUtils.stringToDate(paramMap.get("startDate") + " 00:00:00", "yyyy-MM-dd HH:mm:ss"))
                 .le(!StringUtil.isBlank(paramMap.get("endDate")), "CREATED_TIME", DateReportUtils.stringToDate(paramMap.get("endDate") + " 23:59:59", "yyyy-MM-dd HH:mm:ss"))
-
+                .isNull("IS_DELETE")
         ;
 
         result = improvementProposalsService.page(frontPage.getPagePlus(), queryWrapper);
@@ -138,7 +142,11 @@ public class ImprovementProposalsController {
     @ResponseBody
     @GetMapping("/delete/{id}")
     public R removeById(@PathVariable("id") String id) {
-        boolean res = improvementProposalsService.removeById(id);
+        ImprovementProposals improvementProposals = new ImprovementProposals();
+        improvementProposals.setHandle(id);
+        improvementProposals.setIsDelete("true");
+        int res = improvementProposalsMapper.updateById(improvementProposals);
+//        boolean res = improvementProposalsService.removeById(id);
         return R.ok(res);
     }
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/ImprovementProposals.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/ImprovementProposals.java
index 7f058e1c..888e7ea8 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/ImprovementProposals.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/ImprovementProposals.java
@@ -175,4 +175,8 @@ public class ImprovementProposals extends Model<ImprovementProposals> {
     @ExcelColumn(value = "SEQ")
     private Integer SEQ;
 
+    @TableField("IS_DELETE")
+    @ExcelColumn(value = "IS_DELETE")
+    private String isDelete;
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java
index 2de6ad07..33f9fcd1 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.service.impl;
 
 import com.foreverwin.mesnac.common.util.ExcelUtils;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -104,6 +105,11 @@ public class TemporaryFixServiceImpl extends ServiceImpl<TemporaryFixMapper, Tem
                 return R.failed("导出数据失败：0条数据");
             }
             temporaryFixList = this.temporaryFixImportFile(temporaryFixList);
+            for (TemporaryFix temporaryFix : temporaryFixList) {
+                if (StringUtils.isBlank(temporaryFix.getUploadCenter()) || StringUtils.isBlank(temporaryFix.getUploadUser())){
+                    return R.failed("请导入正确的上传车间或上传人员且不为空");
+                }
+            }
             boolean result = this.saveBatch(temporaryFixList);
             return R.ok(result);
         } catch (Exception e) {
diff --git a/anomaly/src/main/resources/mapper/ImprovementProposalsMapper.xml b/anomaly/src/main/resources/mapper/ImprovementProposalsMapper.xml
index 2665b1d4..90da333f 100644
--- a/anomaly/src/main/resources/mapper/ImprovementProposalsMapper.xml
+++ b/anomaly/src/main/resources/mapper/ImprovementProposalsMapper.xml
@@ -28,11 +28,12 @@
         <result column="CREATED_TIME" property="createdTime" />
         <result column="UPDATED_BY" property="updatedBy" />
         <result column="UPDATED_TIME" property="updatedTime" />
+        <result column="IS_DELETE" property="isDelete" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, UPLOAD_CENTER, UPLOAD_USER, SEQUENCE_CODE, PROJECT_NUMBER, CLASSIFY, PROJECT_LEADER, MEMBERS, MATERIAL_DATE, BEFORE_PROBLEMS, BEFORE_PICTURE, AFTER_PLAN, AFTER_PICTURE, IMPROVE_EFFECT, PRINCIPAL_OPINION, PROPOSED_AMOUNT, FINAL_AMOUNT, GROUP_VIEWS, MANAGER_VIEWS, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME,ROWNUM SEQ
+        HANDLE, SITE, UPLOAD_CENTER, UPLOAD_USER, SEQUENCE_CODE, PROJECT_NUMBER, CLASSIFY, PROJECT_LEADER, MEMBERS, MATERIAL_DATE, BEFORE_PROBLEMS, BEFORE_PICTURE, AFTER_PLAN, AFTER_PICTURE, IMPROVE_EFFECT, PRINCIPAL_OPINION, PROPOSED_AMOUNT, FINAL_AMOUNT, GROUP_VIEWS, MANAGER_VIEWS, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME,IS_DELETE,ROWNUM SEQ
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -90,6 +91,7 @@
             <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
             <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
             <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+            <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
         </where>
     </select>
 
@@ -124,6 +126,7 @@
                 <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                 <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                 <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -166,6 +169,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -208,6 +212,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -250,6 +255,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -292,6 +298,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -334,6 +341,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -372,6 +380,7 @@
             <if test="createdTime!=null">CREATED_TIME,</if>
             <if test="updatedBy!=null">UPDATED_BY,</if>
             <if test="updatedTime!=null">UPDATED_TIME,</if>
+            <if test="isDelete!=null">IS_DELETE,</if>
         </trim> VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
             #{handle},
@@ -398,6 +407,7 @@
             <if test="createdTime!=null">#{createdTime},</if>
             <if test="updatedBy!=null">#{updatedBy},</if>
             <if test="updatedTime!=null">#{updatedTime},</if>
+            <if test="isDelete!=null">#{isDelete},</if>
         </trim>
     </insert>
 
@@ -431,6 +441,7 @@
             #{createdTime},
             #{updatedBy},
             #{updatedTime},
+            #{isDelete},
         </trim>
     </insert>
 
@@ -460,6 +471,7 @@
         <if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if>
         <if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if>
         <if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if>
+        <if test="et.isDelete!=null">IS_DELETE=#{et.isDelete},</if>
         </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
     </update>
 
@@ -489,6 +501,7 @@
         CREATED_TIME=#{et.createdTime},
         UPDATED_BY=#{et.updatedBy},
         UPDATED_TIME=#{et.updatedTime},
+        IS_DELETE=#{et.isDelete},
      </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
     </update>
 
@@ -518,6 +531,7 @@
         <if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if>
         <if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if>
         <if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if>
+        <if test="et.isDelete!=null">IS_DELETE=#{et.isDelete},</if>
     </trim>
         <where>
             <if test="ew!=null">
@@ -546,6 +560,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -605,6 +620,7 @@
                     <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
                     <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
                     <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
+                    <if test="ew.entity.isDelete!=null"> AND IS_DELETE=#{ew.entity.isDelete}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}