feat: 0521 优化

src/main/java/com/glxp/api/constant/Constant.java

@@ -36,6 +36,11 @@ public class Constant {
     public static final String DEV_DBG = "DBG";     //设备变更
     public static final String DEV_DYC = "DYC";     //设备移除
 
+    public static final String DEV_DJH = "DJH";     //设备计划
+    public static final String DEV_DXJ = "DXJ";     //设备巡检任务
+    public static final String DEV_DBX = "DBX";     //设备报修单号
+    public static final String DEV_DWX = "DWX";     //设备维修单号
+
 
     /**
      * 盘点单据前缀

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -53,6 +53,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -397,23 +398,24 @@ public class IoOrderDetailResultController extends BaseController {
             deviceInfoData.put("index", String.valueOf(i));
             deviceInfoData.put("deviceCode", item.getDeviceCode() == null ? ' ' : item.getDeviceCode());
             deviceInfoData.put("deptName", item.getDeptName() == null ? ' ' : item.getDeptName());
-            deviceInfoData.put("statusName", item.getStatusName() == null ? ' ' : item.getStatusName());
+//            deviceInfoData.put("statusName", item.getStatusName() == null ? ' ' : item.getStatusName());
-            deviceInfoData.put("udi", item.getUdi() == null ? ' ' : item.getUdi());
+//            deviceInfoData.put("udi", item.getUdi() == null ? ' ' : item.getUdi());
-            deviceInfoData.put("nameCode", item.getNameCode() == null ? ' ' : item.getNameCode());
+//            deviceInfoData.put("nameCode", item.getNameCode() == null ? ' ' : item.getNameCode());
             deviceInfoData.put("productName", item.getProductName() == null ? ' ' : item.getProductName());
             deviceInfoData.put("ggxh", item.getGgxh() == null ? ' ' : item.getGgxh());
-            deviceInfoData.put("batchNo", item.getBatchNo() == null ? ' ' : item.getBatchNo());
+            deviceInfoData.put("assetValue", item.getAssetValue() == null ? "0.00" : String.valueOf(item.getAssetValue().setScale(2, RoundingMode.HALF_UP)));
-            deviceInfoData.put("serialNo", item.getSerialNo() == null ? ' ' : item.getSerialNo());
+//            deviceInfoData.put("batchNo", item.getBatchNo() == null ? ' ' : item.getBatchNo());
-            deviceInfoData.put("productionDate", item.getProductionDate() == null ? ' ' : item.getProductionDate());
+//            deviceInfoData.put("serialNo", item.getSerialNo() == null ? ' ' : item.getSerialNo());
-            deviceInfoData.put("expireDate", item.getExpireDate() == null ? ' ' : item.getExpireDate());
+//            deviceInfoData.put("productionDate", item.getProductionDate() == null ? ' ' : item.getProductionDate());
-            deviceInfoData.put("manufactory", item.getManufactory() == null ? ' ' : item.getManufactory());
+//            deviceInfoData.put("expireDate", item.getExpireDate() == null ? ' ' : item.getExpireDate());
-            deviceInfoData.put("measname", item.getMeasname() == null ? ' ' : item.getMeasname());
+//            deviceInfoData.put("manufactory", item.getManufactory() == null ? ' ' : item.getManufactory());
-            deviceInfoData.put("zczbhhzbapzbh", item.getZczbhhzbapzbh() == null ? ' ' : item.getZczbhhzbapzbh());
+//            deviceInfoData.put("measname", item.getMeasname() == null ? ' ' : item.getMeasname());
-            deviceInfoData.put("supName", item.getSupName() == null ? ' ' : item.getSupName());
+//            deviceInfoData.put("zczbhhzbapzbh", item.getZczbhhzbapzbh() == null ? ' ' : item.getZczbhhzbapzbh());
-            deviceInfoData.put("changeCount", item.getChangeCount() == null ? '0' : item.getChangeCount());
+//            deviceInfoData.put("supName", item.getSupName() == null ? ' ' : item.getSupName());
-            deviceInfoData.put("repairApplyCount", item.getRepairApplyCount() == null ? '0' : item.getRepairApplyCount());
+//            deviceInfoData.put("changeCount", item.getChangeCount() == null ? '0' : item.getChangeCount());
-            deviceInfoData.put("repairCount", item.getRepairCount() == null ? '0' : item.getRepairCount());
+//            deviceInfoData.put("repairApplyCount", item.getRepairApplyCount() == null ? '0' : item.getRepairApplyCount());
-            deviceInfoData.put("checkCount", item.getCheckCount() == null ? '0' : item.getCheckCount());
+//            deviceInfoData.put("repairCount", item.getRepairCount() == null ? '0' : item.getRepairCount());
+//            deviceInfoData.put("checkCount", item.getCheckCount() == null ? '0' : item.getCheckCount());
 
             list.add(deviceInfoData);
             i++;

src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java

@@ -32,6 +32,12 @@ public class DeviceCheckEntity {
     @TableId(value = "taskId")
     private Long taskId;
 
+    /**
+     * 巡检任务单号
+     */
+    @TableField(value = "taskBillNo")
+    private String taskBillNo;
+
     /**
      * 计划id
      */

src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java

@@ -33,6 +33,12 @@ public class DevicePlanEntity {
     @TableId(value = "planId")
     private Long planId;
 
+    /**
+     * 计划单号
+     */
+    @TableField(value = "planBillNo")
+    private String planBillNo;
+
     /**
      * 计划名称
      */

src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyEntity.java

@@ -28,6 +28,12 @@ public class DeviceRepairApplyEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 报修单号
+     */
+    @TableField(value = "repairApplyBillNo")
+    private String repairApplyBillNo;
+
     /**
      * 状态 待受理，受理中，维修中，完成
      */

src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java

@@ -32,6 +32,12 @@ public class DeviceRepairEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 维修单号
+     */
+    @TableField(value = "repairBillNo")
+    private String repairBillNo;
+
     /**
      * 维修申请id
      */

src/main/java/com/glxp/api/entity/dev/DeviceUpkeepEntity.java

@@ -29,6 +29,12 @@ public class DeviceUpkeepEntity {
     @TableId(value = "taskId")
     private Long taskId;
 
+    /**
+     * 保养任务单号
+     */
+    @TableField(value = "taskBillNo")
+    private String taskBillNo;
+
     /**
      * 计划id
      */

src/main/java/com/glxp/api/req/dev/DevicePlanParam.java

@@ -1,11 +1,15 @@
 package com.glxp.api.req.dev;
 
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.dev.DevicePlanEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
+import com.glxp.api.util.SpringUtils;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -83,6 +87,7 @@ public class DevicePlanParam {
     }
 
     public DevicePlanEntity getEntity(AuthAdmin user) {
+        GennerOrderUtils gennerOrderUtils = SpringUtils.getBean(GennerOrderUtils.class);
         boolean isUpdate = (planId != null);
         DevicePlanEntity build = DevicePlanEntity.builder()
                 .planId(!isUpdate ? SnowflakeUtil.getId() : planId)
@@ -96,7 +101,8 @@ public class DevicePlanParam {
                 .type(type)
                 .build();
         if (!isUpdate) {
-            build.setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName()).setCreateTime(LocalDateTime.now());
+            build.setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName()).setCreateTime(LocalDateTime.now())
+            .setPlanBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DJH, "yyyyMMdd")));
         }
         return build;
     }

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java

@@ -2,6 +2,7 @@ package com.glxp.api.req.dev;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceInfoEntity;
 import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
@@ -11,7 +12,10 @@ import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
+import com.glxp.api.util.SpringUtils;
 import com.glxp.api.vo.dev.DeviceInfoVo;
 import lombok.Data;
 
@@ -77,9 +81,11 @@ public class DeviceRepairApplyAddParam {
 
 
     public DeviceRepairApplyEntity getEntity(AuthAdmin user) {
+        GennerOrderUtils gennerOrderUtils = SpringUtils.getBean(GennerOrderUtils.class);
         return DeviceRepairApplyEntity
                 .builder()
                 .id(SnowflakeUtil.getId())
+                .repairApplyBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DBX, "yyyyMMdd")))
                 .status(DeviceRepairApplyStatusEnum.WAIT_PROCESS)
                 .applyDeptCode(user.getLocDeptCode())
                 .applyDeptName(user.getDeptName())

src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.*;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
@@ -14,6 +15,8 @@ import com.glxp.api.req.dev.DevicePlanDetailItemQuery;
 import com.glxp.api.req.dev.DevicePlanDetailQuery;
 import com.glxp.api.service.dev.*;
 import com.glxp.api.dao.dev.DeviceCheckMapper;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
 import com.glxp.api.vo.dev.DeviceCheckPrintVo;
 import com.glxp.api.vo.dev.DeviceCheckPrintVo.DetailVo;
@@ -55,6 +58,9 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
     @Lazy
     @Autowired
     private DeviceCheckDetailItemService deviceCheckDetailItemService;
+    @Lazy
+    @Autowired
+    private GennerOrderUtils gennerOrderUtils;
 
     private final ThreadPoolTaskExecutor taskExecutor;
 
@@ -79,6 +85,7 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
         DeviceCheckEntity deviceCheckEntity = DeviceCheckEntity.builder()
                 .taskId(SnowflakeUtil.getId())
                 .planId(plan.getPlanId())
+                .taskBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DXJ, "yyyyMMdd")))
                 .planName(plan.getName())
                 .chargeDeptCode(plan.getChargeDeptCode())
                 .name(plan.getName())

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
 import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
@@ -24,6 +25,8 @@ import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
 import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
 import com.glxp.api.service.dev.*;
 import com.glxp.api.dao.dev.DeviceRepairApplyDetailMapper;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
 import groovy.util.logging.Slf4j;
 import lombok.RequiredArgsConstructor;
@@ -55,6 +58,11 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
     @Autowired
     @Lazy
     DeviceRepairService deviceRepairService;
+    @Autowired
+    @Lazy
+    GennerOrderUtils gennerOrderUtils;
+
+
     final DeviceInfoService deviceInfoService;
 
     @Override
@@ -100,9 +108,10 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                     .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
                     .setRepairUserName(param.getRepairUserName())
                     .setRepairUserId(param.getRepairUserId())
-                    .setRepairUserPhone(param.getRepairUserPhone()).
+                    .setRepairUserPhone(param.getRepairUserPhone())
-                    setRepairDeptCode(param.getRepairDeptCode())
+                    .setRepairDeptCode(param.getRepairDeptCode())
                     .setDiagnosisLivePath(param.getDiagnosisLivePath())
+                    .setRepairBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DWX, "yyyyMMdd")))
             ;
             deviceRepairService.createRepair(repairEntity);
         }

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java

@@ -113,7 +113,7 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
     @Transactional
     public void addDeviceRepairApply(DeviceRepairApplyAddParam param, AuthAdmin user) {
         param.valid();
-        DeviceRepairApplyEntity repairApply = param.getEntity(user);
+        DeviceRepairApplyEntity repairApply = param. getEntity(user);
         List<DeviceRepairApplyDetailEntity> detailEntityList = param.getDetailEntityList(repairApply.getId(), deviceInfoService, user);
         Long taskId = param.getTaskId();
         detailEntityList.forEach(d -> {

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java

@@ -44,7 +44,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
         List<DeviceRepairEntity> list = super.list(Wrappers.lambdaQuery(DeviceRepairEntity.class)
                 .eq(DeviceRepairEntity::getRepairUserId, query.getCreateUserId())
                 .eq(query.getIsFinish() != null, DeviceRepairEntity::getFinishFlag, query.getIsFinish())
-                .eq(StrUtil.isNotBlank(query.getDeviceCode()), DeviceRepairEntity::getDeviceCode, query.getDeviceCode())
+                .like(StrUtil.isNotBlank(query.getDeviceCode()), DeviceRepairEntity::getDeviceCode, query.getDeviceCode())
                 .orderByAsc(DeviceRepairEntity::getFinishFlag)
                 .orderByDesc(DeviceRepairEntity::getCreateTime)
         );

src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.dev.DeviceUpkeepMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.*;
@@ -12,6 +13,8 @@ import com.glxp.api.enums.dev.DeviceStatusEnum;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.dev.DeviceUpkeepQuery;
 import com.glxp.api.service.dev.*;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
 import com.glxp.api.vo.dev.*;
 import lombok.RequiredArgsConstructor;
@@ -48,6 +51,8 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
     @Resource
     DevicePlanService devicePlanService;
     @Resource
+    GennerOrderUtils gennerOrderUtils;
+    @Resource
     DeviceUpkeepDetailService deviceUpkeepDetailService;
     @Resource
     DevicePlanDetailItemService devicePlanDetailItemService;
@@ -87,6 +92,7 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
 
         DeviceUpkeepEntity deviceUpkeepEntity = DeviceUpkeepEntity.builder()
                 .taskId(SnowflakeUtil.getId())
+                .taskBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DXJ, "yyyyMMdd")))
                 .planId(plan.getPlanId())
                 .planName(plan.getName())
                 .chargeDeptCode(plan.getChargeDeptCode())

src/main/resources/mybatis/mapper/dev/DeviceCheckMapper.xml

@@ -3,28 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.dev.DeviceCheckMapper">
-
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.dev.DeviceCheckEntity">
-            <id property="taskId" column="taskId" jdbcType="BIGINT"/>
-            <result property="planId" column="planId" jdbcType="BIGINT"/>
-            <result property="planName" column="planName" jdbcType="VARCHAR"/>
-            <result property="checkUserId" column="checkUserId" jdbcType="BIGINT"/>
-            <result property="checkUserName" column="checkUserName" jdbcType="VARCHAR"/>
-            <result property="checkUserPhone" column="checkUserPhone" jdbcType="VARCHAR"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="sysFlag" column="sysFlag" jdbcType="BIT"/>
-            <result property="createTime" column="createTime" jdbcType="TIMESTAMP"/>
-            <result property="createUserId" column="createUserId" jdbcType="BIGINT"/>
-            <result property="createUserName" column="createUserName" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        taskId,planId,planName,
-        checkUserId,checkUserName,checkUserPhone,
-        name,remark,sysFlag,
-        createTime,createUserId,createUserName
-    </sql>
     <select id="pageVo" resultType="com.glxp.api.vo.dev.DeviceCheckVo">
         select c.*, d.name chargeDeptName
         from device_check c

src/main/resources/schemas/schema_v2.4.sql

@@ -3397,7 +3397,13 @@ ALTER TABLE  device_plan_detail_item
     DROP PRIMARY KEY,
     ADD PRIMARY KEY (`planId`, `productId`, `itemCode`, `deviceCode`) USING BTREE;
 
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`, `remark`, `create_time`, `update_time`, `jrxmlPath`,
-                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                             `bussinessType`, `bussinessStatus`) VALUES (4, '设备标签模板', 2, 0, '', '7bdc497e-b0e4-444d-be63-cc27978568ea.jasper', 10,
-                                                         `modelKey`)
+                                                                         1, '', '2024-05-21 16:24:56', '2024-05-21 16:24:56', '2427d70b-2b69-483f-9a9d-7c9c4a3c688e.jrxml', NULL, NULL);
-VALUES (6, 33, 110, 0, NULL, '科室设备报表打印', NULL, NULL, NULL, NULL, 'reportForms');
+
+
+CALL Pro_Temp_ColumnWork('device_plan', 'planBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''计划单号''', 1);
+CALL Pro_Temp_ColumnWork('device_check', 'taskBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''巡检任务单号''', 1);
+CALL Pro_Temp_ColumnWork('device_repair_apply', 'repairApplyBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''报修单号''', 1);
+CALL Pro_Temp_ColumnWork('device_repair', 'repairBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修单号''', 1);
+CALL Pro_Temp_ColumnWork('device_upkeep', 'taskBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''保养任务单号''', 1);