槽液修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java

@@ -99,6 +99,12 @@ public class MaterialQuota extends BaseEntity {
 	 */
 	@Schema(description = "大批量定额")
 	private BigDecimal bigBatQuota;
+
+	/**
+	 * 局部镀定额
+	 */
+	@Schema(description = "局部镀定额")
+	private BigDecimal localBatQuota;
 	/**
 	 * 排序
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java

@@ -170,6 +170,14 @@ public class LiquidTankTaskCopyController extends BladeController {
                     log.warn("key = {}, value = {}, type = {}", key, value, value.getClass());
                 }
         );
+
+
+        Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
+        Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
+        map.put(BaseRequest.CREATE_TIME_START, null);
+        map.put(BaseRequest.CREATE_TIME_END, null);
+
+
         QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(map, LiquidTankTask.class);
         // 正常结束的，异常结束的
         qw.in(BaseCol.STATUS, asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK));
@@ -180,9 +188,9 @@ public class LiquidTankTaskCopyController extends BladeController {
         // 待测成分/分析项目
         qw.like(map.containsKey(LiquidTankTaskCopy.COL_TEST_ELEMENT), LiquidTankTaskCopy.COL_TEST_ELEMENT, Func.toStr(map.get("testElement")));
         // 范围日期
-        if (map.containsKey(BaseRequest.CREATE_TIME_START) && map.containsKey(BaseRequest.CREATE_TIME_END)) {
-            Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
-            Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
+        if (null != crStart && null != crEnd) {
+//            Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
+//            Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
             qw.between(BaseCol.CREATE_TIME, crStart, crEnd);
         }
         // ID 升序
@@ -247,15 +255,18 @@ public class LiquidTankTaskCopyController extends BladeController {
         ids.add(2029744474384678914L);
         ids.add(2029740705257250817L);
 
+        Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
+        Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
+
         QueryWrapper<LiquidTankTaskCopy> qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class);
         // 正常结束的，异常结束的
 //        qw.in(BaseCol.STATUS, asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK));
         // [作业中心]id
         qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_CENTER_ID), LiquidTankTaskCopy.COL_WORK_CENTER_ID, Func.toLong(map.get("workCenterId")));
         // 范围日期
-        if (map.containsKey(BaseRequest.CREATE_TIME_START) && map.containsKey(BaseRequest.CREATE_TIME_END)) {
-            Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
-            Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
+        if (null != crStart && null != crEnd) {
+//            Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
+//            Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
             qw.between(BaseCol.CREATE_TIME, crStart, crEnd);
         }
 //        qw.in("ID",ids);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java

@@ -254,15 +254,27 @@ public class LiquidTankWaveController extends BladeController {
 	@Operation(summary = "list分页", description  = "传入LiquidTankWave Obj")
 	public R<IPage<LiquidTankWaveVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankWave,
 	                                        Query query) {
-        QueryWrapper<LiquidTankWave> qw = Condition.getQueryWrapper(liquidTankWave, LiquidTankWave.class);
+
+		Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START);
+		Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END);
+		liquidTankWave.put(BaseRequest.CREATE_TIME_START, null);
+		liquidTankWave.put(BaseRequest.CREATE_TIME_END, null);
+		QueryWrapper<LiquidTankWave> qw = Condition.getQueryWrapper(liquidTankWave, LiquidTankWave.class);
         qw.eq(liquidTankWave.containsKey("name"), LiquidTankReport.COL_NAME, liquidTankWave.get("name"));
-        if (liquidTankWave.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankWave.containsKey(BaseRequest.CREATE_TIME_END)) {
-            Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START);
-            Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END);
+        if (null != crStart && null != crEnd) {
+//            Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START);
+//            Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END);
             qw.between(BaseCol.CREATE_TIME, crStart, crEnd);
         }
 		IPage<LiquidTankWave> pages = service.page(Condition.getPage(query), qw);
 		IPage<LiquidTankWaveVO> pagesVO = LiquidTankWaveWrapper.build().pageVO(pages);
+		List<LiquidTankWaveVO> listVO = pagesVO.getRecords();
+		for(LiquidTankWaveVO vo : listVO){
+			R<User> user = userClient.userInfoById(vo.getUpdateUser());
+			if(null != user && null != user.getData()){
+				vo.setUpdateUserRealName(user.getData().getRealName());
+			}
+		}
 		return R.data(pagesVO);
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java

@@ -96,9 +96,9 @@ public class RemindMsgController extends BladeController {
             partName = map.get("partName").toString();
         }
         QueryWrapper<RemindMsg> qw = Condition.getQueryWrapper(map, RemindMsg.class);
-        if(!partName.isEmpty()){
-            qw.like(RemindMsg.PART_NAME, partName);
-        }
+//        if(!partName.isEmpty()){
+//            qw.like(RemindMsg.PART_NAME, partName);
+//        }
 //        qw.like(map.containsKey("partName"), RemindMsg.PART_NAME, map.get("partName"));
         IPage<RemindMsg> pages = service.page(Condition.getPage(query), qw);
         IPage<RemindMsgVO> pagesVO = RemindMsgWrapper.build().pageVO(pages);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java

@@ -292,6 +292,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
             if (IdUtil.isValid(teamId)) {
                 lt.setTeamId(teamId);
             }
+            baseMapper.updateById(lt);
         }
         return R.success();
     }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/FullMergeExcelUtil.java

@@ -9,6 +9,7 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO;
 
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -313,6 +314,8 @@ public class FullMergeExcelUtil {
 //            sheet.autoSizeColumn(i);
         }
 
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 定义日期格式
+
         // -------------------------- 第三步：填充User实体数据 --------------------------
         int dataStartRow = 2;
         CellStyle dataStyle = createStyle(workbook, false, (short) 12, HorizontalAlignment.CENTER);
@@ -326,7 +329,10 @@ public class FullMergeExcelUtil {
             int a = 0;
             Cell cell0 = dataRow.createCell(a);
             cell0.setCellStyle(dataStyle);
-            cell0.setCellValue(user.getSampleDate());
+            if(null != user.getSampleDate()){
+                cell0.setCellValue(user.getSampleDate().format(formatter));
+            }
+//            cell0.setCellValue(user.getSampleDate());
 
             //温度
             int b = 1;
@@ -427,7 +433,7 @@ public class FullMergeExcelUtil {
             cell19.setCellStyle(dataStyle);
             cell19.setCellValue(qualified);
 
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             //有效期
             Cell cell20 = dataRow.createCell(20);
             cell20.setCellStyle(dataStyle);