添加目录字段

one-certificate-manager/db/add_db.sql

@@ -31,9 +31,14 @@ CREATE TABLE `mortals_xhx_child_license`  (
  `formContent` mediumtext COMMENT '提交的表单',
  `processStatus` tinyint(2)    DEFAULT '0'  COMMENT '处理状态(0.未处理,1.已处理)',
  `remark` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+ `reportUserId` bigint(20)  DEFAULT NULL COMMENT '联报用户',
+ `reportUserName` varchar(64)  DEFAULT NULL COMMENT '联报用户名称',
+ `reportTime` datetime DEFAULT NULL COMMENT '联报时间',
  `createTime` datetime(0) NOT NULL  COMMENT '创建时间',
  `createUserId` bigint(20) NOT NULL  COMMENT '创建用户',
+ `createUserName` varchar(64)  DEFAULT NULL COMMENT '创建用户名称',
  `updateUserId` bigint(20)  DEFAULT NULL COMMENT '更新用户',
+ `updateUserName` varchar(64)  DEFAULT NULL COMMENT '更新用户名称',
  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`id`) USING BTREE,
  KEY `siteId` (`siteId`) USING BTREE,

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/ChildLicenseEntity.java

@@ -11,126 +11,146 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.child.model.vo.ChildLicenseVo;
 import lombok.Data;
 /**
-* 行业许可子证实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 行业许可子证实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-28
+ */
 @Data
 public class ChildLicenseEntity extends ChildLicenseVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点Id
-    */
+     * 站点Id
+     */
     private Long siteId;
     /**
-    * 站点名称
-    */
+     * 站点名称
+     */
     private String siteName;
     /**
-    * 目录id
-    */
+     * 目录id
+     */
     private Long catalogId;
     /**
-    * 目录名称
-    */
+     * 目录名称
+     */
     private String catalogName;
     /**
-    * 申请Id
-    */
+     * 申请Id
+     */
     private Long applyId;
     /**
-    * 子证配置Id
-    */
+     * 子证配置Id
+     */
     private Long documentId;
     /**
-    * 子证名称
-    */
+     * 子证名称
+     */
     private String documentName;
     /**
-    * 部门id
-    */
+     * 部门id
+     */
     private Long deptId;
     /**
-    * 部门名称
-    */
+     * 部门名称
+     */
     private String deptName;
     /**
-    * 市场主体名称
-    */
+     * 市场主体名称
+     */
     private String marketEntityName;
     /**
-    * 许可证编号
-    */
+     * 许可证编号
+     */
     private String licenseCode;
     /**
-    * 法定代表人（负责人）
-    */
+     * 法定代表人（负责人）
+     */
     private String legalPersonName;
     /**
-    * 统一社会信用代码
-    */
+     * 统一社会信用代码
+     */
     private String creditCode;
     /**
-    * 制证日期
-    */
+     * 制证日期
+     */
     private Date productLicenseTime;
     /**
-    * 证件二维码
-    */
+     * 证件二维码
+     */
     private String certQRCode;
     /**
-    * 制证机关
-    */
+     * 制证机关
+     */
     private String certAuthority;
     /**
-    * 经营场所
-    */
+     * 经营场所
+     */
     private String businessPlace;
     /**
-    * 许可项目
-    */
+     * 许可项目
+     */
     private String licensedItems;
     /**
-    * 正本文件名称
-    */
+     * 正本文件名称
+     */
     private String originalFileName;
     /**
-    * 正本文件相对路径地址
-    */
+     * 正本文件相对路径地址
+     */
     private String originalFilePath;
     /**
-    * 副本文件名称
-    */
+     * 副本文件名称
+     */
     private String copyFileName;
     /**
-    * 副本文件相对路径地址
-    */
+     * 副本文件相对路径地址
+     */
     private String copyFilePath;
     /**
-    * 简介
-    */
+     * 简介
+     */
     private String summary;
     /**
-    * 动态表单样式
-    */
+     * 动态表单样式
+     */
     private String formStyleContent;
     /**
-    * 提交的表单
-    */
+     * 提交的表单
+     */
     private String formContent;
     /**
-    * 处理状态(0.未处理,1.已处理)
-    */
+     * 处理状态(0.未处理,1.已处理)
+     */
     private Integer processStatus;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 联报用户
+     */
+    private Long reportUserId;
+    /**
+     * 联报用户名称
+     */
+    private String reportUserName;
+    /**
+     * 联报时间
+     */
+    private Date reportTime;
+    /**
+     * 创建用户名称
+     */
+    private String createUserName;
+    /**
+     * 更新用户名称
+     */
+    private String updateUserName;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -138,39 +158,44 @@ public class ChildLicenseEntity extends ChildLicenseVo {
         if (obj instanceof ChildLicenseEntity) {
             ChildLicenseEntity tmp = (ChildLicenseEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.siteName = "";
-            this.catalogId = null;
-            this.catalogName = "";
-            this.applyId = null;
-            this.documentId = null;
-            this.documentName = "";
-            this.deptId = null;
-            this.deptName = "";
-            this.marketEntityName = "";
-            this.licenseCode = "";
-            this.legalPersonName = "";
-            this.creditCode = "";
-            this.productLicenseTime = null;
-            this.certQRCode = "";
-            this.certAuthority = "";
-            this.businessPlace = "";
-            this.licensedItems = "";
-            this.originalFileName = "";
-            this.originalFilePath = "";
-            this.copyFileName = "";
-            this.copyFilePath = "";
-            this.summary = "";
-            this.formStyleContent = "";
-            this.formContent = "";
-            this.processStatus = 0;
-            this.remark = "";
+        this.siteId = null;
+        this.siteName = "";
+        this.catalogId = null;
+        this.catalogName = "";
+        this.applyId = null;
+        this.documentId = null;
+        this.documentName = "";
+        this.deptId = null;
+        this.deptName = "";
+        this.marketEntityName = "";
+        this.licenseCode = "";
+        this.legalPersonName = "";
+        this.creditCode = "";
+        this.productLicenseTime = null;
+        this.certQRCode = "";
+        this.certAuthority = "";
+        this.businessPlace = "";
+        this.licensedItems = "";
+        this.originalFileName = "";
+        this.originalFilePath = "";
+        this.copyFileName = "";
+        this.copyFilePath = "";
+        this.summary = "";
+        this.formStyleContent = "";
+        this.formContent = "";
+        this.processStatus = 0;
+        this.remark = "";
+        this.reportUserId = null;
+        this.reportUserName = "";
+        this.reportTime = null;
+        this.createUserName = "";
+        this.updateUserName = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/vo/ChildLicenseVo.java

@@ -19,5 +19,10 @@ public class ChildLicenseVo extends BaseEntityLong {
     /** 主键ID，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java

@@ -5,6 +5,8 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.annotation.DataPermission;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery;
+import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,6 +51,9 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private CertificateDocumentService certificateDocumentService;
+
     public ChildLicenseController() {
         super.setModuleDesc("行业许可子证");
     }
@@ -57,6 +62,11 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "legalPersonName", LegalPersonNameEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+
+        this.addDict(model,"documentId", certificateDocumentService.find(new CertificateDocumentQuery())
+                .stream().collect(Collectors.toMap(x->x.getId(),y->y.getDocumentName(),(o,n)->n)));
+
+
         super.init(model, context);
     }