应急物资台账添加编码

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -18,6 +20,9 @@ public class QhseEmergencyBookPageReqVO extends PageParam {
     @Schema(description = "应急物资名称", example = "芋艿")
     private String emergencyName;
 
+    @Schema(description = "应急物资编码")
+    private String emergencyCode;
+
     @Schema(description = "应急物资单位")
     private String emergencyUnit;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - QHSE应检物资台账 Response VO")
 @Data
@@ -20,6 +20,9 @@ public class QhseEmergencyBookRespVO {
     @ExcelProperty("应急物资名称")
     private String emergencyName;
 
+    @Schema(description = "应急物资编码")
+    private String emergencyCode;
+
     @Schema(description = "应急物资单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("应急物资单位")
     private String emergencyUnit;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - QHSE应检物资台账新增/修改 Request VO")
 @Data
@@ -16,6 +16,9 @@ public class QhseEmergencyBookSaveReqVO {
     @NotEmpty(message = "应急物资名称不能为空")
     private String emergencyName;
 
+    @Schema(description = "应急物资编码")
+    private String emergencyCode;
+
     @Schema(description = "应急物资单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "应急物资单位不能为空")
     private String emergencyUnit;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/emergency/QhseEmergencyBookDO.java

@@ -30,6 +30,10 @@ public class QhseEmergencyBookDO extends BaseDO {
      * 应急物资名称
      */
     private String emergencyName;
+    /**
+     * 应急物资编码
+     */
+    private String emergencyCode;
     /**
      * 应急物资单位
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/emergency/QhseEmergencyBookMapper.java

@@ -18,6 +18,7 @@ public interface QhseEmergencyBookMapper extends BaseMapperX<QhseEmergencyBookDO
     default PageResult<QhseEmergencyBookDO> selectPage(QhseEmergencyBookPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhseEmergencyBookDO>()
                 .likeIfPresent(QhseEmergencyBookDO::getEmergencyName, reqVO.getEmergencyName())
+                .likeIfPresent(QhseEmergencyBookDO::getEmergencyCode, reqVO.getEmergencyCode())
                 .eqIfPresent(QhseEmergencyBookDO::getEmergencyUnit, reqVO.getEmergencyUnit())
                 .eqIfPresent(QhseEmergencyBookDO::getEmergencyNumber, reqVO.getEmergencyNumber())
                 .eqIfPresent(QhseEmergencyBookDO::getEmergencyLocation, reqVO.getEmergencyLocation())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/emergency/QhseEmergencyBookServiceImpl.java

@@ -1,17 +1,25 @@
 package cn.iocoder.yudao.module.pms.service.qhse.emergency;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo.QhseEmergencyBookPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo.QhseEmergencyBookSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.DeptUtil;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.emergency.QhseEmergencyBookDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.emergency.QhseEmergencyBookMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
 /**
@@ -25,17 +33,24 @@ public class QhseEmergencyBookServiceImpl implements QhseEmergencyBookService {
 
     @Resource
     private QhseEmergencyBookMapper qhseEmergencyBookMapper;
+    @Autowired
+    private DeptUtil deptUtil;
+    @Autowired
+    private DeptApi deptApi;
 
     @Override
     public Long createQhseEmergencyBook(QhseEmergencyBookSaveReqVO createReqVO) {
         // 插入
         QhseEmergencyBookDO qhseEmergencyBook = BeanUtils.toBean(createReqVO, QhseEmergencyBookDO.class);
+        Long deptId = createReqVO.getDeptId();
+        DeptRespDTO dept = deptApi.getDept(deptId);
+        String companyCode = deptUtil.getCompanyCode(deptId);
+        qhseEmergencyBook.setEmergencyCode(companyCode + PinyinUtil.getPinyin(dept.getName()) + DateUtil.format(new Date(), "yyMMddHHmmss"));
         qhseEmergencyBook.setDeleted(false);
         qhseEmergencyBookMapper.insert(qhseEmergencyBook);
         // 返回
         return qhseEmergencyBook.getId();
     }
-
     @Override
     public void updateQhseEmergencyBook(QhseEmergencyBookSaveReqVO updateReqVO) {
         // 校验存在