提交隐患检查单

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/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,42 +34,18 @@ import java.time.LocalDate;
  */
 @Data
 public class ReqCreateCheckRecord {
-	/**
-	 * 检查单号
-	 */
-	private String checkFormNo;
-	/**
-	 * 所属网格
-	 */
-	private Long gridId;
 	/**
 	 * 所属检查表
 	 */
 	private Long checkFormId;
 	/**
-	 * 检查表名称
-	 */
-	private String checkFormName;
-	/**
-	 * 所属部门
-	 */
-	private String department;
-	/**
-	 * 部门名称
-	 */
-	private String departmentName;
-	/**
-	 * 所属关区
+	 * 关区代码
 	 */
 	private String customs;
 	/**
-	 * 关区名称
-	 */
-	private String customsName;
-	/**
-	 * 检查时间
+	 * 检查时间 yyyy-MM-dd
 	 */
-	private Long checkTime;
+	private String checkTime;
 	/**
 	 * 检查人员
 	 */
@@ -77,27 +55,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

@@ -24,6 +24,7 @@ package com.customs.cq.datacenter.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.customs.cq.datacenter.common.*;
+import com.customs.cq.datacenter.common.enums.ECheckFormStatus;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
 import com.customs.cq.datacenter.common.model.Tuple;
 import com.customs.cq.datacenter.common.utils.*;
@@ -56,7 +57,10 @@ public class CheckRecordService extends BasicService {
         // 设置主键
         item.setId(SnowFlakeUtil.getId());
         // 设置状态
-        //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());
         // 是否删除(逻辑删除)初始值

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-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";

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 '是否删除(逻辑删除)';