问题修改

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

@@ -3,9 +3,11 @@ package com.tld.controller;
 import com.tld.model.Container;
 import com.tld.model.Scrap;
 import com.tld.service.ContainerService;
+import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -35,8 +37,8 @@ public class ContainerController {
      * @return 返回结果
      */
     @PostMapping("addContainer")
-    public Map<String, Object> addContainer(@RequestBody Container container){
-        return containerService.addContainer(container);
+    public Map<String, Object> addContainer(@RequestBody Container container, HttpServletRequest request){
+        return containerService.addContainer(container,request);
     }
 
     /**
@@ -45,8 +47,8 @@ public class ContainerController {
      * @return 返回结果
      */
     @PutMapping("updateContainer")
-    public Map<String, Object> updateContainer(@RequestBody Container container){
-        return containerService.updateContainer(container);
+    public Map<String, Object> updateContainer(@RequestBody Container container , HttpServletRequest request){
+        return containerService.updateContainer(container,request);
     }
 
     /**

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

@@ -44,6 +44,14 @@ public class Container implements Serializable {
      * 创建时间
      */
     private String createTime;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
     /**
      * 页数
      */

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

@@ -2,16 +2,18 @@ package com.tld.service;
 
 import com.tld.model.Container;
 import com.tld.model.Scrap;
+import org.apache.http.HttpRequest;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 public interface ContainerService {
     Map<String, Object> getContainer(Container container);
 
-    Map<String, Object> addContainer(Container container);
+    Map<String, Object> addContainer(Container container , HttpServletRequest request);
 
-    Map<String, Object> updateContainer(Container container);
+    Map<String, Object> updateContainer(Container container , HttpServletRequest request);
 
     Map<String, Object> delContainer(Map<String, Object> param);
 

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

@@ -8,10 +8,12 @@ import com.tld.model.Container;
 import com.tld.model.Department;
 import com.tld.model.Scrap;
 import com.tld.service.ContainerService;
+import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -40,9 +42,10 @@ public class ContainerServiceImpl implements ContainerService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addContainer(Container container) {
+    public Map<String, Object> addContainer(Container container , HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            container.setModifyUser(request.getHeader("userId"));
             containerMapper.addContainer(container);
             map.put("msg", "200");
         }catch (Exception e){
@@ -55,9 +58,10 @@ public class ContainerServiceImpl implements ContainerService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateContainer(Container container) {
+    public Map<String, Object> updateContainer(Container container , HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            container.setModifyUser(request.getHeader("userId"));
             containerMapper.updateContainer(container);
             map.put("msg", "200");
         }catch (Exception e){

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

@@ -48,7 +48,9 @@ public class QueryListServiceImpl implements QueryListService {
                 map1.put("materialName", data.get("name"));
                 map1.put("wllbCode", data.get("code"));
                 if(Double.parseDouble(map1.get("minNum").toString()) > Double.parseDouble(map1.get("amount").toString())
-                || Double.parseDouble(map1.get("maxNum").toString()) < Double.parseDouble(map1.get("amount").toString())){
+                || Double.parseDouble(map1.get("maxNum").toString()) < Double.parseDouble(map1.get("amount").toString())
+                || map1.get("amount").toString().equals("0")
+                ){
                     mapList.add(map1);
                 }
             }

src/main/resources/mapper/ContainerMapper.xml

@@ -16,9 +16,12 @@
             a.container_name,
             a.num,
             a.code,
-            a.create_time
+            a.create_time,
+            a.modify_time as modifyTime,
+            c.user_name as modifyUser
         from tld_container a
         left join tld_department b on a.department = b.id
+        left join tld_user c on a.modify_user = c.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="department != null and department != ''">
                 and a.department = #{department}
@@ -37,8 +40,8 @@
     </select>
     <!-- 新增容器内容 -->
     <insert id="addContainer">
-        insert into tld_container(department,type,container_name,num,code,create_time)
-         values(#{department},#{type},#{containerName},#{num},#{code},DATE_FORMAT(NOW(), '%Y-%m-%d'))
+        insert into tld_container(department,type,container_name,num,code,create_time,modify_user,modify_time)
+         values(#{department},#{type},#{containerName},#{num},#{code},NOW(),#{modifyUser},NOW())
     </insert>
     <!-- 修改容器内容 -->
     <update id="updateContainer">
@@ -60,6 +63,8 @@
                 <if test="code != null">
                     code = #{code},
                 </if>
+                modify_user = #{modifyUser} ,
+                modify_time = NOW(),
             </trim>
         </set>
         where id = #{id}

src/main/resources/mapper/QueryListMappeer.xml

@@ -42,7 +42,7 @@
     <!-- 物料储量预警查询 -->
     <select id="reserveWarning" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT
-            ifnull(sum( a.amount ), 0) as amount,
+            ifnull(sum( a.amount ), "0" ) as amount,
             ${tldId} as materialId,
             ${minNum} as minNum,
             ${maxNum} as maxNum