set时间

src/main/java/com/chinaitop/depot/qualityControl/controller/QualityInspectionController.java

@@ -40,7 +40,7 @@ public class QualityInspectionController {
     }
 
     @PutMapping("/update")
-    @ApiOperation(value = "新增", notes = "新增")
+    @ApiOperation(value = "修改", notes = "修改")
     public ResponseEntity update(@RequestBody BusinessQcQualityInspection saveParam) {
         return ResponseEntity.ok(qualityInspectionService.update(saveParam));
     }

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -751,10 +751,10 @@
         org_id = #{orgId}
       </if>
       <if test="basicStorehouseId != null and basicStorehouseId != ''">
-        basic_storehouse_id = #{basicStorehouseId}
+        and basic_storehouse_id = #{basicStorehouseId}
       </if>
       <if test="warehouseId != null and warehouseId != ''">
-        warehouse_id = #{warehouseId}
+        and warehouse_id = #{warehouseId}
       </if>
     </where>
     ORDER BY createdate DESC

src/main/java/com/chinaitop/depot/qualityControl/service/impl/QualityInspectionServiceImpl.java

@@ -22,10 +22,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author qingsong.han
@@ -54,7 +51,7 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
         if (!StringUtils.isEmpty(xh)) {
             String substring = xh.substring(xh.length() - 4);
             int i = Integer.parseInt(substring);
-            if (i < 999)
+            if (i < 9999)
                 num += i;
         }
         // 生成质检报告单(检验类别+检验日期(yyyyMMdd)+4位顺序号组成)
@@ -65,6 +62,9 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
                         GenerateNumberUtil.integerToString(4, num)
                 )
         );
+        Date date = new Date();
+        saveParam.setCreatedate(date);
+        saveParam.setUpdatedate(date);
         int insert = qualityInspectionMapper.insert(saveParam);
         Integer id = saveParam.getId();
         log.info("id: {}", id);
@@ -73,6 +73,9 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
             List<BusinessQcQualityInspectionItem> item = saveParam.getItem();
             if (!ObjectUtils.isEmpty(item)) {
                 item.forEach(i -> {
+                    Date now = new Date();
+                    i.setCreatedate(now);
+                    i.setUpdatedate(now);
                     i.setQcQualityInspectionId(id);
                     qualityInspectionItemMapper.insert(i);
                 });
@@ -91,9 +94,13 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int update(BusinessQcQualityInspection saveParam) {
+        saveParam.setUpdatedate(new Date());
         int i = qualityInspectionMapper.updateByPrimaryKey(saveParam);
         if (i > 0) {
-            saveParam.getItem().forEach(it -> qualityInspectionItemMapper.updateByPrimaryKey(it));
+            saveParam.getItem().forEach(it -> {
+                it.setUpdatedate(new Date());
+                qualityInspectionItemMapper.updateByPrimaryKey(it);
+            });
         }
         return i;
     }