secure-producting-business/src/main/java/com/customs/cq/datacenter/business/controller/CheckRecordController.java

@@ -22,21 +22,22 @@
 */
 package com.customs.cq.datacenter.business.controller;
 
+import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
+import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqCreateCheckRecord;
+import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
+import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
+import com.customs.cq.datacenter.business.service.CheckRecordService;
 import com.customs.cq.datacenter.common.ExecutedResult;
 import com.customs.cq.datacenter.common.PagerResult;
+import com.customs.cq.datacenter.common.core.controller.BasicController;
+import com.customs.cq.datacenter.common.model.ReqListId;
 import com.customs.cq.datacenter.common.utils.ParameterUtil;
 import com.customs.cq.datacenter.common.validator.ParameterValidateResult;
 import com.customs.cq.datacenter.common.validator.ParameterValidator;
-import com.customs.cq.datacenter.common.core.controller.BasicController;
-import com.customs.cq.datacenter.common.model.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
-import com.customs.cq.datacenter.business.service.CheckRecordService;
-import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqCreateCheckRecord;
-import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
-import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
-import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
 
 /**
  * 2010.隐患检查记录
@@ -51,12 +52,11 @@ public class CheckRecordController extends BasicController {
     private CheckRecordService service;
 
     /**
-     * 创建[隐患检查记录]
+     * 提交隐患检查单
      * @author lin.liu
-     * @description 创建[隐患检查记录]
      */
-    @PostMapping(value = "create")
-    public ExecutedResult<Long> create(@RequestBody ReqCreateCheckRecord request) {
+    @PostMapping(value = "submit")
+    public ExecutedResult<Long> submit(@RequestBody ReqCreateCheckRecord request) {
         //#region 参数验证
         ParameterValidator validator = new ParameterValidator()
                 // 非空

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRecordItemPO.java

@@ -39,6 +39,7 @@ public class CheckRecordItemPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属检查记录
@@ -140,11 +141,6 @@ public class CheckRecordItemPO {
 	 */
 	@TableField(value = "RECTIFY_PERSON_NAME")
 	private String rectifyPersonName;
-	/**
-	 * 附件列表
-	 */
-	@TableField(value = "ATTACHMENT_LIST")
-	private String attachmentList;
 	/**
 	 * 数据创建时间
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRecordPO.java

@@ -106,6 +106,11 @@ public class CheckRecordPO {
 	 */
 	@TableField(value = "DANGER_CATEGORY")
 	private Long dangerCategory;
+	/**
+	 * 附件列表
+	 */
+	@TableField(value = "ATTACHMENT_LIST")
+	private String attachmentList;
 	/**
 	 * 是否有隐患
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/checkrecord/ReqCreateCheckRecord.java

@@ -22,8 +22,10 @@
 */
 package com.customs.cq.datacenter.business.entity.request.checkrecord;
 
+import com.customs.cq.datacenter.business.entity.request.checkrecorditem.ReqCreateCheckRecordItem;
 import lombok.Data;
-import java.time.LocalDate;
+
+import java.util.List;
 
 /**
  * 隐患检查记录
@@ -32,10 +34,6 @@ import java.time.LocalDate;
  */
 @Data
 public class ReqCreateCheckRecord {
-	/**
-	 * 检查单号
-	 */
-	private String checkFormNo;
 	/**
 	 * 所属网格
 	 */
@@ -45,29 +43,13 @@ public class ReqCreateCheckRecord {
 	 */
 	private Long checkFormId;
 	/**
-	 * 检查表名称
-	 */
-	private String checkFormName;
-	/**
-	 * 所属部门
-	 */
-	private String department;
-	/**
-	 * 部门名称
-	 */
-	private String departmentName;
-	/**
-	 * 所属关区
+	 * 关区代码
 	 */
 	private String customs;
 	/**
-	 * 关区名称
+	 * 检查时间 yyyy-MM-dd
 	 */
-	private String customsName;
-	/**
-	 * 检查时间
-	 */
-	private Long checkTime;
+	private String checkTime;
 	/**
 	 * 检查人员
 	 */
@@ -77,27 +59,15 @@ public class ReqCreateCheckRecord {
 	 */
 	private String contactInfo;
 	/**
-	 * 网格类型
-	 */
-	private Long gridCategory;
-	/**
-	 * 隐患分类
-	 */
-	private Long dangerCategory;
-	/**
-	 * 是否有隐患
-	 */
-	private Integer hasDanger;
-	/**
-	 * 是否已提供整改措施
+	 * 附件列表
 	 */
-	private Integer hasRectifyPlan;
+	private List<String> listAttachment;
 	/**
-	 * 整改措施提交时间
+	 * 检查项列表
 	 */
-	private Long rectifySubmitTime;
+	private List<ReqCreateCheckRecordItem> listItem;
 	/**
-	 * 整改期限
+	 * 是否直接提交(提交到网格管理员/暂存) EYesOrNo
 	 */
-	private Long rectifyDeadline;
+	private Integer isSubmit;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/checkrecorditem/ReqCreateCheckRecordItem.java

@@ -32,50 +32,14 @@ import java.time.LocalDate;
  */
 @Data
 public class ReqCreateCheckRecordItem {
-	/**
-	 * 所属检查记录
-	 */
-	private Long checkRecordId;
-	/**
-	 * 所属网格
-	 */
-	private Long gridId;
 	/**
 	 * 所属检查表
 	 */
 	private Long checkFormId;
-	/**
-	 * 检查表名称
-	 */
-	private String checkFormName;
-	/**
-	 * 所属部门
-	 */
-	private String department;
-	/**
-	 * 部门名称
-	 */
-	private String departmentName;
-	/**
-	 * 所属关区
-	 */
-	private String customs;
-	/**
-	 * 关区名称
-	 */
-	private String customsName;
 	/**
 	 * 检查项
 	 */
 	private String itemName;
-	/**
-	 * 检查时间
-	 */
-	private Long checkTime;
-	/**
-	 * 检查人员
-	 */
-	private String checkPerson;
 	/**
 	 * 检查结果 ECheckResult
 	 */
@@ -84,36 +48,8 @@ public class ReqCreateCheckRecordItem {
 	 * 整改措施
 	 */
 	private String rectifyPlan;
-	/**
-	 * 整改措施提交时间
-	 */
-	private Long rectifySubmitTime;
 	/**
 	 * 整改期限
 	 */
 	private Long rectifyDeadline;
-	/**
-	 * 整改状态 ERectifyStatus
-	 */
-	private Integer rectifyStatus;
-	/**
-	 * 实际整改完成时间
-	 */
-	private Long rectifyTime;
-	/**
-	 * 是否准时完成整改
-	 */
-	private Integer isOnTime;
-	/**
-	 * 整改执行人
-	 */
-	private String rectifyPerson;
-	/**
-	 * 整改执行人名称
-	 */
-	private String rectifyPersonName;
-	/**
-	 * 附件列表
-	 */
-	private String attachmentList;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/CheckRecordService.java

@@ -23,22 +23,38 @@
 package com.customs.cq.datacenter.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.customs.cq.datacenter.common.*;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.customs.cq.datacenter.business.domain.CheckRecordPO;
+import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
+import com.customs.cq.datacenter.business.domain.GridInfoPO;
+import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
+import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqCreateCheckRecord;
+import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
+import com.customs.cq.datacenter.business.entity.request.checkrecorditem.ReqCreateCheckRecordItem;
+import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
+import com.customs.cq.datacenter.business.mapper.impl.CheckRecordMapperImpl;
+import com.customs.cq.datacenter.common.ExecutedResult;
+import com.customs.cq.datacenter.common.PagerResult;
+import com.customs.cq.datacenter.common.constant.Constants;
+import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
+import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.common.enums.ECheckFormStatus;
+import com.customs.cq.datacenter.common.enums.ECheckResult;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
+import com.customs.cq.datacenter.common.exception.ServiceException;
+import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.Tuple;
 import com.customs.cq.datacenter.common.utils.*;
-import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
-import com.customs.cq.datacenter.business.mapper.impl.CheckRecordMapperImpl;
-import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqCreateCheckRecord;
-import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
-import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
-import com.customs.cq.datacenter.business.domain.CheckRecordPO;
-import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
 
 /**
  * 隐患检查记录
@@ -49,18 +65,101 @@ import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
 public class CheckRecordService extends BasicService {
     @Autowired
     private CheckRecordMapperImpl dao;
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
+    @Autowired
+    private GridInfoService gridInfoService;
+    @Autowired
+    private DangerCheckFormService dangerCheckFormService;
+
+
 
     public ExecutedResult<Long> create(ReqCreateCheckRecord request) {
+        // 检验网格
+        GridInfoPO grid = gridInfoService.check4IdExc(request.getGridId());
+        // 校验隐患检查单
+        DangerCheckFormPO form = dangerCheckFormService.check4IdExc(request.getCheckFormId());
+        // 数据字典 - 关区代码
+        Map<String, String> mapDicData = dictDataMapper.map4Type("sys_customs_code");
+        if (mapDicData.containsKey(request.getCustoms())) {
+            return ExecutedResult.failed("关区代码不存在." + request.getCustoms());
+        }
+
+        // 登录信息
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (Objects.isNull(loginUser)) {
+            throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
+        }
+
+        Long now = LocalDateTimeUtil.nowTimeStamp();
+
         // 转换po
         CheckRecordPO item = CopierUtil.mapTo(request, CheckRecordPO.class);
         // 设置主键
-        item.setId(SnowFlakeUtil.getId());
+        item.setId(new Sequence(null).nextId());
+        // 检查单号
+        item.setCheckFormNo("CK" + LocalDateTimeUtil.toFormatString(LocalDateTime.now(), "yyyyMMddHHmmssSSS") + RandVerifyCode.complexCode(6));
+        // 检查表名称
+        item.setCheckFormName(form.getName());
+        // 所属部门
+        item.setDepartment(loginUser.getDeptId().toString());
+        // 部门名称
+        item.setDepartmentName(loginUser.getDeptName());
+        // 关区名称
+        item.setCustomsName(mapDicData.get(request.getCustoms()));
+        // 检查时间
+        item.setCheckTime(LocalDateTimeUtil.getTimeStamp(request.getCheckTime(), Constants.STR_DATE).getTime());
+        // 网格类型
+        item.setGridCategory(grid.getGridCategory());
+        // 隐患分类
+        item.setDangerCategory(grid.getDangerCategory());
+        // 附件列表
+        item.setAttachmentList("");
+        if (ListUtil.isNotNullOrEmpty(request.getListAttachment())) {
+            item.setAttachmentList(StringUtil.join(request.getListAttachment()));
+        }
+        Integer hasRectifyPlan = EYesOrNo.NO.getValue();
+        Long rectifyDeadline = 0L;
+        // 是否有隐患
+        item.setHasDanger(EYesOrNo.NO.getValue());
+        if (request.getListItem().stream().anyMatch(c -> Objects.equals(ECheckResult.HAS_DANGER.getValue(), c.getCheckResult()))) {
+            item.setHasDanger(EYesOrNo.YES.getValue());
+
+            hasRectifyPlan = EYesOrNo.YES.getValue();
+            for (ReqCreateCheckRecordItem checkItem : request.getListItem()) {
+                if (Objects.equals(ECheckResult.HAS_DANGER.getValue(), checkItem.getCheckResult())) {
+                    if (StringUtil.isNullOrEmpty(checkItem.getRectifyPlan())) {
+                        hasRectifyPlan = EYesOrNo.NO.getValue();
+                        break;
+                    } else {
+                        if (checkItem.getRectifyDeadline().compareTo(rectifyDeadline) > 0) {
+                            rectifyDeadline = checkItem.getRectifyDeadline();
+                        }
+                    }
+                }
+            }
+        }
+        // 整改措施状态
+        item.setHasRectifyPlan(hasRectifyPlan);
+        item.setRectifySubmitTime(0L);
+        item.setRectifyDeadline(0L);
+        if (Objects.equals(hasRectifyPlan, EYesOrNo.YES.getValue())) {
+            item.setRectifySubmitTime(now);
+            item.setRectifyDeadline(rectifyDeadline);
+        }
         // 设置状态
-        //item.setStatus(EState.NORMAL.getValue());
+        item.setStatus(ECheckFormStatus.STAGING.getValue());
+        if (Objects.equals(request.getIsSubmit(), EYesOrNo.YES.getValue())) {
+            item.setStatus(ECheckFormStatus.SUBMITTED.getValue());
+        }
         // 设置记录创建时间
-        item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
+        item.setCreateTime(now);
         // 是否删除(逻辑删除)初始值
         item.setIsDelete(EYesOrNo.NO.getValue());
+        // 创建人信息
+        item.setCreateBy(loginUser.getUserId().toString());
+        item.setCreateByName(loginUser.getUsername());
 
         int result = this.dao.insert(item);
         if (result != 1) {

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/DangerCheckFormService.java

@@ -38,8 +38,10 @@ import com.customs.cq.datacenter.common.ExecutedResult;
 import com.customs.cq.datacenter.common.PagerResult;
 import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
 import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EState;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
+import com.customs.cq.datacenter.common.exception.ServiceException;
 import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.Tuple;
 import com.customs.cq.datacenter.common.utils.*;
@@ -308,4 +310,11 @@ public class DangerCheckFormService extends BasicService {
         }
         return ExecutedResult.success(exists);
     }
+    protected DangerCheckFormPO check4IdExc(Long id) {
+        ExecutedResult<DangerCheckFormPO> check = this.check4Id(id);
+        if (check.isFailed()) {
+            throw new ServiceException(check.getMsg(), EResultCode.NOT_FOUND.getCode());
+        }
+        return check.getData();
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/GridInfoService.java

@@ -42,8 +42,10 @@ import com.customs.cq.datacenter.common.PagerResult;
 import com.customs.cq.datacenter.common.core.domain.entity.SysDept;
 import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
 import com.customs.cq.datacenter.common.core.service.BasicService;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EState;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
+import com.customs.cq.datacenter.common.exception.ServiceException;
 import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.NameValueDto;
 import com.customs.cq.datacenter.common.model.Tuple;
@@ -315,6 +317,13 @@ public class GridInfoService extends BasicService {
         }
         return ExecutedResult.success(exists);
     }
+    protected GridInfoPO check4IdExc(Long id) {
+        ExecutedResult<GridInfoPO> check = this.check4Id(id);
+        if (check.isFailed()) {
+            throw new ServiceException(check.getMsg(), EResultCode.NOT_FOUND.getCode());
+        }
+        return check.getData();
+    }
 
     // 设置网格员
     public ExecutedResult<String> setListPerson(ReqSetListPerson request) {

secure-producting-common/src/main/java/com/customs/cq/datacenter/common/enums/ECheckFormStatus.java

@@ -0,0 +1,63 @@
+package com.customs.cq.datacenter.common.enums;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public enum ECheckFormStatus {
+    /**
+     * 暂存=1,
+     */
+    STAGING("暂存", 1),
+    /**
+     * 已提交=2,
+     */
+    SUBMITTED("已提交", 2),
+    ;
+
+    /**
+     * 枚举描述
+     */
+    private String desc;
+    /**
+     * 枚举值
+     */
+    private Integer value;
+
+    public Integer getValue() {
+        return value;
+    }
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 构造方法
+     * @param desc 枚举描述
+     * @param value 枚举值
+     */
+    ECheckFormStatus(String desc, Integer value) {
+        this.desc = desc;
+        this.value = value;
+    }
+
+    /**
+     * 根据值获取枚举
+     *
+     * @param value 枚举值
+     * @return
+     */
+    public static ECheckFormStatus getByValue(Integer value) {
+        return Arrays.stream(ECheckFormStatus.values())
+                .filter(e -> Objects.equals(e.getValue(), value))
+                .findAny()
+                .orElse(null);
+    }
+
+    @Override
+    public String toString() {
+        return "ECheckCycle{" +
+                "desc='" + desc + '\'' +
+                ", value=" + value +
+                '}';
+    }
+}

secure-producting-common/src/main/java/com/customs/cq/datacenter/common/enums/ECheckResult.java

@@ -0,0 +1,67 @@
+package com.customs.cq.datacenter.common.enums;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public enum ECheckResult {
+    /**
+     * 无隐患=1,
+     */
+    NONE("无隐患", 1),
+    /**
+     * 有隐患=2,
+     */
+    HAS_DANGER("有隐患", 2),
+    /**
+     * 不适用=99,
+     */
+    INAPPLICABLE("不适用", 99),
+    ;
+
+    /**
+     * 枚举描述
+     */
+    private String desc;
+    /**
+     * 枚举值
+     */
+    private Integer value;
+
+    public Integer getValue() {
+        return value;
+    }
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 构造方法
+     * @param desc 枚举描述
+     * @param value 枚举值
+     */
+    ECheckResult(String desc, Integer value) {
+        this.desc = desc;
+        this.value = value;
+    }
+
+    /**
+     * 根据值获取枚举
+     *
+     * @param value 枚举值
+     * @return
+     */
+    public static ECheckResult getByValue(Integer value) {
+        return Arrays.stream(ECheckResult.values())
+                .filter(e -> Objects.equals(e.getValue(), value))
+                .findAny()
+                .orElse(null);
+    }
+
+    @Override
+    public String toString() {
+        return "ECheckResult{" +
+                "desc='" + desc + '\'' +
+                ", value=" + value +
+                '}';
+    }
+}

secure-producting-host/src/main/resources/application-jeff.yml

@@ -27,7 +27,7 @@ spring:
           # type: com.alibaba.druid.pool.DruidDataSource
           type: ${spring.datasource.type}
           driverClassName: dm.jdbc.driver.DmDriver
-          url: jdbc:dm://218.201.25.103:5236?schema=SECURE_PRODUCTING
+          url: jdbc:dm://localhost:5236?schema=SECURE_PRODUCTING
           username: SECURE_PRODUCTING
           password: SECURE_PRODUCTING.2024
       hikari:

secure-producting-host/src/test/java/com/customs/cq/datacenter/host/GenCodeRun.java

@@ -17,7 +17,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class GenCodeRun {
-    private static final String HOST = "218.201.25.103";
+    private static final String HOST = "localhost";
     private static final String PORT = "5236";
     private static final String USER = "SECURE_PRODUCTING";
     private static final String PASSWORD = "SECURE_PRODUCTING.2024";

secure-producting-system/src/main/java/com/customs/cq/datacenter/system/h4a/service/H4AService.java

@@ -470,7 +470,7 @@ public class H4AService {
         try {
             rolesOfUser = H4AReaderHelper.getRolesOfUser(userGuid, orgGuid, appCode);
         } catch (Exception e) {
-            throw new H4AException(String.format("获取H4A人员角色失败，人员GUID：%s，部门GUID：%s", userGuid, orgGuid), e);
+            return new ArrayList<>();
         }
         return wrapRolesOfUser(rolesOfUser);
     }

secure-producting-system/src/main/java/com/customs/cq/datacenter/system/mapper/SysDictDataMapper.java

@@ -6,6 +6,8 @@ import com.customs.cq.datacenter.common.core.domain.entity.SysDictData;
 import com.customs.cq.datacenter.common.core.mapper.BaseMapperPlus;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 字典表 数据层
@@ -21,4 +23,9 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, Sys
                 .eq(SysDictData::getDictType, dictType)
                 .orderByAsc(SysDictData::getDictSort));
     }
+
+    default Map<String, String> map4Type(String dictType) {
+        List<SysDictData> list = this.selectDictDataByType(dictType);
+        return list.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
+    }
 }

secure-producting-system/src/main/java/com/customs/cq/datacenter/system/service/impl/SysDictDataServiceImpl.java

@@ -1,6 +1,8 @@
 package com.customs.cq.datacenter.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.customs.cq.datacenter.system.mapper.SysDictDataMapper;
 import com.customs.cq.datacenter.system.service.ISysDictDataService;
@@ -126,4 +128,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         }
         throw new ServiceException("操作失败");
     }
+
+    public List<SysDictData> list4Type(String dicType) {
+        return baseMapper.selectDictDataByType(dicType);
+    }
 }

secure-producting-system/src/main/java/com/customs/cq/datacenter/system/service/impl/SysUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
 import com.customs.cq.datacenter.common.utils.ListUtil;
 import com.customs.cq.datacenter.system.domain.SysUserRole;
@@ -488,6 +489,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                     sysUser = new SysUser();
                     sysUser.setPassword(BCrypt.hashpw("123456"));
                     sysUser.setStatus("0");
+                    sysUser.setUserType("sys_user");
                 }
                 sysUser.setEmail(user.getEmail());
 
@@ -524,7 +526,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                 result++;
             }
         } catch (H4AException e) {
-            e.printStackTrace();
+            throw new ServiceException(e.getMsg(), EResultCode.ERROR.getCode());
         }
         return result;
     }

sql/20240814.sql

@@ -343,6 +343,7 @@ CREATE TABLE "SECURE_PRODUCTING"."SP_CHECK_RECORD"(
   "CONTACT_INFO" VARCHAR(50) NOT NULL DEFAULT '',
   "GRID_CATEGORY" BIGINT NOT NULL DEFAULT 0,
   "DANGER_CATEGORY" BIGINT NOT NULL DEFAULT 0,
+  "ATTACHMENT_LIST" VARCHAR(5000) NOT NULL DEFAULT '',
   "HAS_DANGER" TINYINT NOT NULL DEFAULT 0,
   "HAS_RECTIFY_PLAN" TINYINT NOT NULL DEFAULT 0,
   "RECTIFY_SUBMIT_TIME" BIGINT NOT NULL DEFAULT 0,
@@ -386,6 +387,7 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."CHECK_PERSON" IS '检
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."CONTACT_INFO" IS '联系方式';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."GRID_CATEGORY" IS '网格类型';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."DANGER_CATEGORY" IS '隐患分类';
+COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."ATTACHMENT_LIST" IS '附件列表';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."HAS_DANGER" IS '是否有隐患';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."HAS_RECTIFY_PLAN" IS '是否已提供整改措施';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD"."RECTIFY_SUBMIT_TIME" IS '整改措施提交时间';
@@ -426,7 +428,6 @@ CREATE TABLE "SECURE_PRODUCTING"."SP_CHECK_RECORD_ITEM"(
   "IS_ON_TIME" TINYINT NOT NULL DEFAULT 0,
   "RECTIFY_PERSON" VARCHAR(50) NOT NULL DEFAULT '',
   "RECTIFY_PERSON_NAME" VARCHAR(50) NOT NULL DEFAULT '',
-  "ATTACHMENT_LIST" VARCHAR(5000) NOT NULL DEFAULT '',
   "CREATE_TIME" BIGINT NOT NULL DEFAULT 0,
   "UPDATE_TIME" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(),
   "IS_DELETE" TINYINT NOT NULL DEFAULT 0,
@@ -466,7 +467,6 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."RECTIFY_TIME" IS
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."IS_ON_TIME" IS '是否准时完成整改';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."RECTIFY_PERSON" IS '整改执行人';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."RECTIFY_PERSON_NAME" IS '整改执行人名称';
-COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."ATTACHMENT_LIST" IS '附件列表';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."CREATE_TIME" IS '数据创建时间';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."UPDATE_TIME" IS '最后更新时间';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_CHECK_RECORD_ITEM"."IS_DELETE" IS '是否删除(逻辑删除)';