From 4190b1f594d95de1e1ee8ab098dbfe7e79449d5b Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 22 May 2023 16:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=85=B6=E6=B7=BB=E5=8A=A0=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E4=B8=8E=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MaterialMapper.java                |  8 +-
 .../mapper/MaterialMapper.xml                 | 85 ++++++++++---------
 .../service/impl/MaterialServiceImpl.java     | 12 ++-
 3 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
index df0111eb..b8847928 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
@@ -236,16 +236,16 @@ public interface MaterialMapper {
 
     /**
      * 根据主键id批量将物料状态改为删除
-     * @param ids
+     * @param map
      * @return 受影响条数
      */
-    Integer changeStateToDeletedByIds(List<Integer> ids);
+    Integer changeStateToDeletedByIds(Map<String,Object> map);
     /**
      * 根据主键id将物料状态改为删除
-     * @param id
+     * @param map
      * @return 受影响条数
      */
-    Integer changeStateToDeletedById(Integer id);
+    Integer changeStateToDeletedById(Map<String,Object> map);
 
     /**
      * 根据条件修改状态
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index 6e63e3fb..a7754051 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -153,8 +153,7 @@
     </sql>
     <!-- 查询所有数据的条数 -->
     <select id="findCount" resultType="integer">
-        SELECT
-        count(*)
+        SELECT count(*)
         FROM material m
         where m.depository_id is null
     </select>
@@ -793,8 +792,7 @@
 
     <!--    根据仓库查询物料总数-->
     <select id="findMaterialByDepositoryCount" resultType="int" parameterType="map">
-        SELECT
-        COUNT(*)
+        SELECT COUNT(*)
         from findInventory
         where depositoryId = #{depositoryId}
     </select>
@@ -863,8 +861,7 @@
 
 
     <select id="findMaxMaterialCodeForMt" resultType="string" parameterType="long">
-        select
-       max(code)
+        select max(code)
         from material m
         where m.type_id = #{oldId}
     </select>
@@ -916,7 +913,7 @@
     <insert id="insertMaterial" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO material (
         id, depository_id, mname, quantity, price,
-        type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark,uid
+        type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark,uid,createTime
         ) VALUES (
         #{id},
         <if test="depositoryId != null">
@@ -960,45 +957,41 @@
         #{brand},
         #{productionPlace},
         #{remark},
-        #{uid}
+        #{uid},
+        #{createTime}
         )
     </insert>
     <!-- 插入数据 -->
     <insert id="insertInventory" useGeneratedKeys="true" keyProperty="id">
-        insert into inventory(id,mid,remark,quantity,producedDate,depository_id)
-        values (
-        #{id},
-        #{mid},
-        #{remark},
-        #{quantity},
-        #{producedDate},
-        #{depositoryId}
-        )
+        insert into inventory(id, mid, remark, quantity, producedDate, depository_id)
+        values (#{id},
+                #{mid},
+                #{remark},
+                #{quantity},
+                #{producedDate},
+                #{depositoryId})
     </insert>
     <!--    添加当前批次物料与生产日期对应-->
     <insert id="addMaterialAndProducedDate" useGeneratedKeys="true" keyProperty="id">
-        insert into materialandproduceddate(id,inid,mid,quantity,expendnum,inventory,producedDate,barCode,qrCode)
-        values (
-        #{id},
-        #{inid},
-        #{mid},
-        #{quantity},
-        #{expendnum},
-        #{inventory},
-        #{producedDate},
-        #{barCode},
-        #{qrCode}
-        )
+        insert into materialandproduceddate(id, inid, mid, quantity, expendnum, inventory, producedDate, barCode,
+                                            qrCode)
+        values (#{id},
+                #{inid},
+                #{mid},
+                #{quantity},
+                #{expendnum},
+                #{inventory},
+                #{producedDate},
+                #{barCode},
+                #{qrCode})
     </insert>
 
     <insert id="addBarCodeAndMcode" parameterType="map">
-        insert into qrcodeandmaterial(id,barCode,mcode,flag)
-        values (
-        #{id},
-        #{barCode},
-        #{code},
-        1
-        )
+        insert into qrcodeandmaterial(id, barCode, mcode, flag)
+        values (#{id},
+                #{barCode},
+                #{code},
+                1)
     </insert>
 
 
@@ -1096,7 +1089,7 @@
                 depository_id = #{depositoryId},
             </if>
             <if test="uid != '' and uid != null">
-                uid  = #{uid},
+                uid = #{uid},
             </if>
             <if test="mname != null">
                 mname = #{mname},
@@ -1119,12 +1112,16 @@
             <if test="version != null and version != ''">
                 version = #{version},
             </if>
+            <if test="updateTime != '' and updateTime != null">
+                updateTime = #{updateTime},
+            </if>
             <if test="code != null and code != ''">
                 code = #{code},
             </if>
             <if test="unit != null and unit != ''">
                 unit = #{unit},
             </if>
+
             <if test="depositoryCode != null and depositoryCode !=''">
                 depositoryCode = #{depositoryCode},
             </if>
@@ -1149,6 +1146,7 @@
             <if test="remark != '' and remark != null">
                 remark = #{remark}
             </if>
+
         </set>
         WHERE id = #{id}
     </update>
@@ -1209,7 +1207,9 @@
 
     <!-- 根据主键删除数据 -->
     <delete id="deleteMaterialById" parameterType="int">
-        DELETE FROM material WHERE id = #{id}
+        DELETE
+        FROM material
+        WHERE id = #{id}
     </delete>
 
     <!-- 根据主键批量删除数据
@@ -1220,17 +1220,20 @@
         </foreach>
     </delete>-->
     <!--     根据主键将状态改为删除-->
-    <update id="changeStateToDeletedById" parameterType="int">
+    <update id="changeStateToDeletedById" parameterType="map">
         UPDATE material
         <set>
+            updateTime = #{updateTime},
             state = 3
         </set>
+
         WHERE id = #{id}
     </update>
 
     <update id="updateStateByParam" parameterType="map">
         UPDATE material
         <set>
+            updateTime = #{updateTime},
             state = #{state}
         </set>
         where id = #{id}
@@ -1244,15 +1247,17 @@
     <update id="updateStateByTypeId" parameterType="map">
         UPDATE material
         <set>
+            updateTime = #{updateTime},
             state = #{state}
         </set>
         where type_id = #{typeId}
     </update>
 
     <!-- 根据主键批量将状态改为删除-->
-    <update id="changeStateToDeletedByIds" parameterType="list">
+    <update id="changeStateToDeletedByIds" parameterType="map">
         update material
         <set>
+            updateTime = #{updateTime},
             state = 3
         </set>
         where id in
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 9d74649b..36b76a2f 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -683,7 +683,10 @@ public class MaterialServiceImpl implements MaterialService {
      */
     @Override
     public Integer changeStateToDeletedById(Integer id) {
-        return materialMapper.changeStateToDeletedById(id);
+        Map<String,Object> map = new HashMap<>();
+        map.put("id",id);
+        map.put("updateTime",System.currentTimeMillis());
+        return materialMapper.changeStateToDeletedById(map);
     }
 
     /**
@@ -694,7 +697,10 @@ public class MaterialServiceImpl implements MaterialService {
      */
     @Override
     public Integer changeStateToDeletedByIds(List<Integer> ids) {
-        return materialMapper.changeStateToDeletedByIds(ids);
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",ids);
+        map.put("updateTime",System.currentTimeMillis());
+        return materialMapper.changeStateToDeletedByIds(map);
     }
 
     /**
@@ -725,6 +731,7 @@ public class MaterialServiceImpl implements MaterialService {
      */
     @Override
     public Integer updateStateByParam(Map<String, Object> map) {
+        map.put("updateTime",System.currentTimeMillis());
         return materialMapper.updateStateByParam(map);
     }
 
@@ -736,6 +743,7 @@ public class MaterialServiceImpl implements MaterialService {
      */
     @Override
     public Integer updateStateByTypeId(Map<String, Object> map) {
+        map.put("updateTime",System.currentTimeMillis());
         return materialMapper.updateStateByTypeId(map);
     }