问题修改

src/main/java/com/tld/controller/MaterialClassController.java

@@ -5,6 +5,7 @@ import com.tld.service.MaterialClassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -43,8 +44,8 @@ public class MaterialClassController {
      * @return 返回结果
      */
     @PostMapping("addMaterialClass")
-    public Map<String, Object> addMaterialClass(@RequestBody MaterialClass materialClass){
-        return materialClassService.addMaterialClass(materialClass);
+    public Map<String, Object> addMaterialClass(@RequestBody MaterialClass materialClass, HttpServletRequest request){
+        return materialClassService.addMaterialClass(materialClass, request);
     }
 
     /**
@@ -53,8 +54,8 @@ public class MaterialClassController {
      * @return 返回结果
      */
     @PutMapping("updateMaterialClass")
-    public Map<String, Object> updateMaterialClass(@RequestBody MaterialClass materialClass){
-        return materialClassService.updateMaterialClass(materialClass);
+    public Map<String, Object> updateMaterialClass(@RequestBody MaterialClass materialClass, HttpServletRequest request){
+        return materialClassService.updateMaterialClass(materialClass, request);
     }
 
     /**
@@ -63,7 +64,7 @@ public class MaterialClassController {
      * @return 返回结果
      */
     @PutMapping("updateMaterial")
-    public Map<String, Object> updateMaterial(@RequestBody MaterialClass materialClass){
-        return materialClassService.updateMaterial(materialClass);
+    public Map<String, Object> updateMaterial(@RequestBody MaterialClass materialClass, HttpServletRequest request){
+        return materialClassService.updateMaterial(materialClass, request);
     }
 }

src/main/java/com/tld/controller/UserMaterialController.java

@@ -5,6 +5,7 @@ import com.tld.service.UserMaterialService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -33,8 +34,8 @@ public class UserMaterialController {
      * @return 返回结果
      */
     @PostMapping("addUserMaterial")
-    public Map<String, Object> addUserMaterial(@RequestBody UserMaterial userMaterial){
-        return userMaterialService.addUserMaterial(userMaterial);
+    public Map<String, Object> addUserMaterial(@RequestBody UserMaterial userMaterial, HttpServletRequest request){
+        return userMaterialService.addUserMaterial(userMaterial, request);
     }
 
     /**
@@ -43,8 +44,8 @@ public class UserMaterialController {
      * @return 返回结果
      */
     @PostMapping("updateUserMaterial")
-    public Map<String, Object> updateUserMaterial(@RequestBody UserMaterial userMaterial){
-        return userMaterialService.updateUserMaterial(userMaterial);
+    public Map<String, Object> updateUserMaterial(@RequestBody UserMaterial userMaterial, HttpServletRequest request){
+        return userMaterialService.updateUserMaterial(userMaterial, request);
     }
 
     /**

src/main/java/com/tld/model/Dictionary.java

@@ -95,4 +95,12 @@ public class Dictionary  implements Serializable {
      * 最高数量
      */
     private String maxNum;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
 }

src/main/java/com/tld/model/MaterialClass.java

@@ -76,4 +76,12 @@ public class MaterialClass implements Serializable {
      * 条数
      */
     private int limit;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
 }

src/main/java/com/tld/model/UserMaterial.java

@@ -50,4 +50,12 @@ public class UserMaterial {
      * 条数
      */
     private int limit;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
 }

src/main/java/com/tld/service/MaterialClassService.java

@@ -2,6 +2,7 @@ package com.tld.service;
 
 import com.tld.model.MaterialClass;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public interface MaterialClassService {
@@ -9,9 +10,9 @@ public interface MaterialClassService {
 
     Map<String, Object> delMaterialClass(MaterialClass materialClass);
 
-    Map<String, Object> addMaterialClass(MaterialClass materialClass);
+    Map<String, Object> addMaterialClass(MaterialClass materialClass, HttpServletRequest request);
 
-    Map<String, Object> updateMaterialClass(MaterialClass materialClass);
+    Map<String, Object> updateMaterialClass(MaterialClass materialClass, HttpServletRequest request);
 
-    Map<String, Object> updateMaterial(MaterialClass materialClass);
+    Map<String, Object> updateMaterial(MaterialClass materialClass, HttpServletRequest request);
 }

src/main/java/com/tld/service/UserMaterialService.java

@@ -2,14 +2,15 @@ package com.tld.service;
 
 import com.tld.model.UserMaterial;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public interface UserMaterialService {
     Map<String, Object> getUserMaterial(UserMaterial userMaterial);
 
-    Map<String, Object> addUserMaterial(UserMaterial userMaterial);
+    Map<String, Object> addUserMaterial(UserMaterial userMaterial, HttpServletRequest request);
 
-    Map<String, Object> updateUserMaterial(UserMaterial userMaterial);
+    Map<String, Object> updateUserMaterial(UserMaterial userMaterial, HttpServletRequest request);
 
     Map<String, Object> delUserMaterial(String id);
 

src/main/java/com/tld/service/impl/MaterialClassServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +53,7 @@ public class MaterialClassServiceImpl implements MaterialClassService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addMaterialClass(MaterialClass materialClass) {
+    public Map<String, Object> addMaterialClass(MaterialClass materialClass, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
@@ -66,6 +67,7 @@ public class MaterialClassServiceImpl implements MaterialClassService {
                 map.put("errMsg", "切勿重复录入");
                 return map;
             }
+            materialClass.setModifyUser(request.getHeader("userId"));
             materialClassMapper.addMaterialClass(materialClass);
             map.put("msg", "200");
         }catch (Exception e){
@@ -78,7 +80,7 @@ public class MaterialClassServiceImpl implements MaterialClassService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateMaterialClass(MaterialClass materialClass) {
+    public Map<String, Object> updateMaterialClass(MaterialClass materialClass, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
@@ -87,6 +89,7 @@ public class MaterialClassServiceImpl implements MaterialClassService {
                 map.put("errMsg", "库位已被占用");
                 return map;
             }
+            materialClass.setModifyUser(request.getHeader("userId"));
             materialClassMapper.updateMaterialClass(materialClass);
             map.put("msg", "200");
         }catch (Exception e){
@@ -99,9 +102,10 @@ public class MaterialClassServiceImpl implements MaterialClassService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateMaterial(MaterialClass materialClass) {
+    public Map<String, Object> updateMaterial(MaterialClass materialClass, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            materialClass.setModifyUser(request.getHeader("userId"));
             materialClassMapper.updateMaterial(materialClass);
             map.put("msg", "200");
         } catch (Exception e){

src/main/java/com/tld/service/impl/UserMaterialServiceImpl.java

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,9 +40,10 @@ public class UserMaterialServiceImpl implements UserMaterialService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addUserMaterial(UserMaterial userMaterial) {
+    public Map<String, Object> addUserMaterial(UserMaterial userMaterial, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            userMaterial.setModifyUser(request.getHeader("userId"));
             userMaterialMapper.addUserMaterial(userMaterial);
             map.put("msg", "200");
         }catch (Exception e){
@@ -54,9 +56,10 @@ public class UserMaterialServiceImpl implements UserMaterialService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateUserMaterial(UserMaterial userMaterial) {
+    public Map<String, Object> updateUserMaterial(UserMaterial userMaterial, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            userMaterial.setModifyUser(request.getHeader("userId"));
             userMaterialMapper.updateUserMaterial(userMaterial);
             map.put("msg", "200");
         }catch (Exception e){

src/main/resources/mapper/DictionaryMapper.xml

@@ -34,9 +34,10 @@
     <!-- 查询字典内容分页 -->
     <select id="getDictionaryPage" resultType="com.tld.model.Dictionary">
         select
-               a.*,b.name as materialType
+               a.*,b.name as materialType,c.user_name as modifyUser
         from ${tableName} a
         left join tld_material_type b on a.wllb_class = b.tld_id
+        left join tld_user c on a.modify_user = c.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="name != null and name != ''">
                 and a.name = #{name}

src/main/resources/mapper/MaterialClassMapper.xml

@@ -9,10 +9,13 @@
             a.storage_location_code,
             b.storage_location_name as storageLocationName,
             c.name as wllbName,
-            a.id
+            a.id,
+            a.modify_time as modifyTime,
+            f.user_name as modifyUser
        from tld_material_class a
        left join tld_storage_location b on a.storage_location_code = b.storage_location_code
        left join tld_material c on a.wllb_code = c.tld_id
+       left join tld_user f on a.modify_user = f.id
        <trim prefix="WHERE" prefixOverrides="and |or">
            <if test="storageLocationCode != null and storageLocationCode != ''">
                and a.storage_location_code = #{storageLocationCode}
@@ -32,7 +35,7 @@
     </delete>
     <!-- 新增类别表 -->
     <insert id="addMaterialClass">
-        insert into tld_material_class(storage_location_code,wllb_code) values(#{storageLocationCode}, #{wllbCode})
+        insert into tld_material_class(storage_location_code,wllb_code,modify_user,modify_time) values(#{storageLocationCode}, #{wllbCode},#{modifyUser},NOW())
     </insert>
     <!-- 修改类别表 -->
     <update id="updateMaterialClass">
@@ -45,6 +48,7 @@
                 <if test="wllbCode != null and wllbCode != ''">
                     wllb_code = #{wllbCode},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
         where id = #{id}
@@ -75,6 +79,7 @@
                 <if test="maxNum != null and maxNum != ''">
                     max_num = #{maxNum},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
         where tld_id = #{id}

src/main/resources/mapper/UserMaterialMapper.xml

@@ -12,10 +12,12 @@
             b.name as materialName,
             c.user_name as userName,
             b.code as wllbCode,
-            c.real_name
+            c.real_name,
+            f.user_name as modifyUser
         from tld_user_material a
         left join tld_material b on a.material_id = b.tld_id
         left join tld_user c on a.user_id = c.id
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="materialId != null and materialId != ''">
                 and a.material_id = #{materialId}
@@ -28,7 +30,7 @@
     </select>
     <!-- 新增用户绑定物料信息 -->
     <insert id="addUserMaterial">
-        insert into tld_user_material(material_id,user_id,scrq) value(#{materialId},#{userId},now())
+        insert into tld_user_material(material_id,user_id,scrq,modify_user,modify_time) value(#{materialId},#{userId},now(),#{modifyUser},now())
     </insert>
     <!-- 修改用户绑定物料信息 -->
     <update id="updateUserMaterial">
@@ -41,6 +43,7 @@
                 <if test="userId != null and userId != ''">
                     user_id = #{userId},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
             where id = #{id}