基础数据导出

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/excel/PlatingAssortmentExcel.java

@@ -33,51 +33,17 @@ public class PlatingAssortmentExcel implements Serializable {
     private String code;
 
     /**
-     * 名称
+     * 分类名称
      */
     @ColumnWidth(30)
-    @ExcelProperty("名称")
+    @ExcelProperty("分类名称")
     private String name;
 
     /**
-     * 备注
+     * 分类备注
      */
     @ColumnWidth(40)
-    @ExcelProperty("备注")
+    @ExcelProperty("分类备注")
     private String memo;
 
-    /**
-     * 排序
-     */
-    @ColumnWidth(10)
-    @ExcelProperty("排序")
-    private Long sort;
-
-    /**
-     * 班组成员
-     */
-    @ColumnWidth(30)
-    @ExcelProperty("班组成员")
-    private String teamMember;
-
-    /**
-     * 状态
-     */
-    @ColumnWidth(10)
-    @ExcelProperty("状态")
-    private String statusName;
-
-    /**
-     * 创建时间
-     */
-    @ColumnWidth(20)
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @ColumnWidth(15)
-    @ExcelProperty("创建人")
-    private String createUserRealName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java

@@ -34,10 +34,14 @@ import org.springblade.desk.basic.pojo.vo.FormulaVO;
 import org.springblade.desk.basic.service.IFormulaService;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.basic.wrapper.FormulaWrapper;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.User;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -200,13 +204,21 @@ public class FormulaController extends BladeController {
     public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> formula,
                             BladeUser bladeUser, HttpServletResponse response) {
         QueryWrapper<Formula> qw = Condition.getQueryWrapper(formula, Formula.class);
-        //if (!AuthUtil.isAdministrator()) {
+        qw.eq(Formula.COL_FORMULA_TYPE, Func.toInt(formula.get("formulaType")));
-        //	queryWrapper.lambda().eq(Formula::getTenantId, bladeUser.getTenantId());
+        qw.like(formula.containsKey("name"), Formula.COL_NAME, Func.toStr(formula.get("name")));
-        //}
+        List<Formula> list = service.list(qw);
-        //queryWrapper.lambda().eq(FormulaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+        List<FormulaExcel> excels = new ArrayList<>();
-        List<FormulaExcel> list = service.exportFormula(qw);
+        for(Formula entity : list){
-        ExcelUtil.export(response, "[计算公式]数据" + DateUtil.time(),
+            FormulaExcel excel = new FormulaExcel();
-                "[计算公式]数据表", list, FormulaExcel.class);
+            BeanUtils.copyProperties(entity, excel);
+            User updateUser = UserCache.getUser(entity.getUpdateUser());
+            if(updateUser != null){
+                excel.setUpdateUserName(updateUser.getRealName());
+            }
+            excels.add(excel);
+        }
+        ExcelUtil.export(response, "计算公式" + DateUtil.time(),
+                "计算公式", excels, FormulaExcel.class);
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java

@@ -23,6 +23,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
@@ -40,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -63,7 +65,7 @@ public class PlatingAssortmentController extends BladeController {
 
     @Resource
     private IPlatingAssortmentService service;
-    
+
     @Resource
     private IUserClient userClient;
 
@@ -95,7 +97,7 @@ public class PlatingAssortmentController extends BladeController {
         platingAssortment = platingAssortment.entrySet().stream()
             .filter(entry -> Objects.nonNull(entry.getValue()))
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-        
+
         QueryWrapper<PlatingAssortment> qw = Condition.getQueryWrapper(platingAssortment, PlatingAssortment.class);
         // 添加未删除的条件
         qw.eq("IS_DELETED", CommonConstant.DELETE_FALSE);
@@ -118,7 +120,7 @@ public class PlatingAssortmentController extends BladeController {
     public R<IPage<PlatingAssortmentVO>> page(PlatingAssortmentVO platingAssortment, Query query) {
         // 处理排序字段转换
         QueryUtils.convertSortField(query);
-        
+
         IPage<PlatingAssortmentVO> pagesVO = service.selectPlatingAssortmentPage(
             Condition.getPage(query), platingAssortment
         );
@@ -149,7 +151,7 @@ public class PlatingAssortmentController extends BladeController {
         qw.eq(PlatingAssortment::getStatus, 1); // 只返回启用的
         qw.eq(PlatingAssortment::getIsDeleted, CommonConstant.DELETE_FALSE);
         qw.orderByAsc(PlatingAssortment::getSort, PlatingAssortment::getId);
-        
+
         List<PlatingAssortment> list = service.list(qw);
         List<PlatingAssortmentVO> listVO = PlatingAssortmentWrapper.build().listVO(list);
         return R.data(listVO);
@@ -249,13 +251,38 @@ public class PlatingAssortmentController extends BladeController {
     @Operation(summary = "导出Excel", description = "传入PlatingAssortment")
     public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> platingAssortment,
                             BladeUser bladeUser, HttpServletResponse response) {
+        // 过滤空值
+        platingAssortment = platingAssortment.entrySet().stream()
+                .filter(entry -> Objects.nonNull(entry.getValue()))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        String descs = null;
+        if(platingAssortment.get("descs") != null){
+            descs = (String) platingAssortment.get("descs");
+        }
+        String ascs = null;
+        if(platingAssortment.get("ascs") != null){
+            ascs = (String) platingAssortment.get("ascs");
+        }
         QueryWrapper<PlatingAssortment> qw = Condition.getQueryWrapper(platingAssortment, PlatingAssortment.class);
         // 添加未删除的条件
         qw.eq("IS_DELETED", CommonConstant.DELETE_FALSE);
-        
+        if(descs != null) {
-        List<PlatingAssortmentExcel> list = service.exportPlatingAssortment(qw);
+            qw.orderByDesc(descs);
-        ExcelUtil.export(response, "[镀种分类]数据" + DateUtil.time(),
+        }
-                "[镀种分类]数据表", list, PlatingAssortmentExcel.class);
+        if(ascs != null){
+            qw.orderByAsc(ascs);
+        }
+        qw.orderByAsc("NAME");
+
+        List<PlatingAssortment> list = service.list(qw);
+        List<PlatingAssortmentExcel> excels = new ArrayList<>();
+        for(PlatingAssortment entity : list){
+            PlatingAssortmentExcel excel = new PlatingAssortmentExcel();
+            BeanUtil.copyProperties(entity, excel);
+            excels.add(excel);
+        }
+        ExcelUtil.export(response, "镀种分类" + DateUtil.time(),
+                "镀种分类", excels, PlatingAssortmentExcel.class);
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/FormulaExcel.java

@@ -12,6 +12,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -29,18 +30,6 @@ public class FormulaExcel implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 编码
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("编码")
-	private String code;
-	/**
-	 * [计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值;
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("[计算公式]类型:[1]:槽液加药量;[2]:槽液添加后理论值;")
-	private Long formulaType;
 	/**
 	 * 公式名称
 	 */
@@ -53,22 +42,19 @@ public class FormulaExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("公式内容")
 	private String content;
+
 	/**
-	 * 计算表达式
+	 * 操作人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("计算表达式")
-	private String expression;
-	/**
-	 * 排序
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("排序")
+	@ExcelProperty("操作人")
-	private Long sort;
+	private String updateUserName;
+
 	/**
-	 * 备注
+	 * 更新时间
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备注")
+	@ExcelProperty("更新时间")
-	private String remark;
+	private Date updateTime;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -1794,9 +1794,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             workPlanItemDetail = new WorkPlanItemDetail();
                             workPlanItemDetail.setWorkPlanItemId(planItem.getId());
                             workPlanItemDetail.setTestType(toolEntity.getTestType());
-                            workPlanItemDetail.setRuleSize(toolEntity.getToolSize());
+//                            workPlanItemDetail.setRuleSize(toolEntity.getToolSize());
-                            workPlanItemDetail.setTools(toolEntity.getToolInfo());
+//                            workPlanItemDetail.setTools(toolEntity.getToolInfo());
-                            workPlanItemDetail.setMtId(StringUtils.isNotBlank(toolEntity.getMtId()) ? Long.valueOf(toolEntity.getMtId()) : null);
+//                            workPlanItemDetail.setMtId(StringUtils.isNotBlank(toolEntity.getMtId()) ? Long.valueOf(toolEntity.getMtId()) : null);
                             workPlanItemDetails.add(workPlanItemDetail);
                         }
                         workPlanItemDetailService.saveBatch(workPlanItemDetails);

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

@@ -22,6 +22,7 @@ import jakarta.validation.Valid;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -301,9 +302,9 @@ public class InspectionTaskController extends BladeController {
                 }
             }
         } else {
-            msg.setCheckParam1("1");
+            msg.setCheckParam1("0");
-            msg.setCheckParam2("1");
+            msg.setCheckParam2("0");
-            msg.setCheckParam3("1");
+            msg.setCheckParam3("0");
 
         }
         return R.data(msg);
@@ -312,7 +313,7 @@ public class InspectionTaskController extends BladeController {
     @PostMapping("/getMaterialMsg")
     public R getMaterialMsg(@RequestBody InspectionTaskListVO detailDetail) {
         LambdaQueryWrapper<RemindMsg> qw01 = Wrappers.lambdaQuery(RemindMsg.class)
-                .eq(RemindMsg::getFormula, detailDetail.getFormula())
+                .apply("NLS_UPPER(FORMULA) = NLS_UPPER({0})", detailDetail.getFormula())
                 .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE)
                 .eq(RemindMsg::getRemindMsgType, 3L)
                 .orderByDesc(RemindMsg::getId);
@@ -321,9 +322,12 @@ public class InspectionTaskController extends BladeController {
         if (null != msgMaterialList && msgMaterialList.size() > 0) {
             msg = msgMaterialList.get(0);
             String material = msg.getMaterial();
-            if (null != detailDetail.getMaterial()) {
+            String detailMaterial = detailDetail.getMaterial();
+            if (null != detailMaterial) {
+                detailMaterial = StringUtils.upperCase(detailMaterial);
                 for (String mat : material.split("、")) {
-                    if (detailDetail.getMaterial().contains(mat.trim())) {
+                    mat = StringUtils.upperCase(mat);
+                    if (detailMaterial.contains(mat.trim())) {
                         msg.setCheckMaterial("0");
                         break;
                     } else {
@@ -332,7 +336,7 @@ public class InspectionTaskController extends BladeController {
                 }
             }
         } else {
-            msg.setCheckMaterial("1");
+            msg.setCheckMaterial("0");
         }
         return R.data(msg);
     }