bug修改

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.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery;
 import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
 import com.mortals.xhx.module.device.model.DeviceEntity;
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.mortals.framework.ap.SysConstains.*;
+import static java.util.stream.Collectors.toMap;
 
 import com.mortals.xhx.common.code.*;
 
@@ -49,6 +52,8 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
 
     @Autowired
     private CertificateDocumentService certificateDocumentService;
+    @Autowired
+    private UserService userService;
 
     public ChildLicenseController() {
         super.setModuleDesc("行业许可子证");
@@ -62,6 +67,7 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
         this.addDict(model, "deleted", DeletedEnum.getEnumMap());
         this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery())
                 .stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDocumentName(), (o, n) -> n)));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }
 

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java

@@ -11,150 +11,158 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
 import lombok.Data;
 /**
-* 证照申请实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 证照申请实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-31
+ */
 @Data
 public class ApplyLogEntity extends ApplyLogVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private Long siteId;
     /**
-    * 证照档案ID
-    */
+     * 证照档案ID
+     */
     private Long recordId;
     /**
-    * 证照目录ID
-    */
+     * 证照目录ID
+     */
     private Long catalogId;
     /**
-    * 证照目录编号
-    */
+     * 证照目录编号
+     */
     private String catalogCode;
     /**
-    * 目录名称
-    */
+     * 目录名称
+     */
     private String catalogName;
     /**
-    * 证件编号
-    */
+     * 证件编号
+     */
     private String certificateCode;
     /**
-    * 证件名称
-    */
+     * 证件名称
+     */
     private String certificateName;
     /**
-    * 颁发时间
-    */
+     * 颁发时间
+     */
     private Date issueTime;
     /**
-    * 取件人姓名
-    */
+     * 取件人姓名
+     */
     private String pickerName;
     /**
-    * 取件人证件号码
-    */
+     * 取件人证件号码
+     */
     private String pickerIDCardNo;
     /**
-    * 手机号码
-    */
+     * 手机号码
+     */
     private String mobile;
     /**
-    * 持有者类型，1：自然人，2：法人，3：自然人法人
-    */
+     * 持有者类型，1：自然人，2：法人，3：自然人法人
+     */
     private Integer holderType;
     /**
-    * 持有者证件类型，1：身份证，2：组织机构代码等
-    */
+     * 持有者证件类型，1：身份证，2：组织机构代码等
+     */
     private Integer holderIdType;
     /**
-    * 持有者名称
-    */
+     * 持有者名称
+     */
     private String holderName;
     /**
-    * 持有者证件号码
-    */
+     * 持有者证件号码
+     */
     private String holderIDCardNo;
     /**
-    * 市场主体名称
-    */
+     * 市场主体名称
+     */
     private String enterpriseName;
     /**
-    * 法定代表人
-    */
+     * 法定代表人
+     */
     private String legalPerson;
     /**
-    * 统一社会信用代码
-    */
+     * 统一社会信用代码
+     */
     private String socialCode;
     /**
-    * 有效期起始
-    */
+     * 有效期起始
+     */
     private Date validityStart;
     /**
-    * 有效期截止
-    */
+     * 有效期截止
+     */
     private Date validityEnd;
     /**
-    * 专网ID
-    */
+     * 专网ID
+     */
     private String privateID;
     /**
-    * 证件附件地址
-    */
+     * 证件附件地址
+     */
     private String certificateUrl;
     /**
-    * 证件预览地址
-    */
+     * 证件预览地址
+     */
     private String previewUrl;
     /**
-    * 证照模板表单内容
-    */
+     * 证照模板表单内容
+     */
     private String formContent;
     /**
-    * 证照模板表单内容
-    */
+     * 证照模板表单内容
+     */
     private String formTemplate;
     /**
-    * 生成状态1未生成2已生成
-    */
+     * 生成状态1未生成2已生成
+     */
     private Integer generateStatus;
     /**
-    * 档案操作类型1新增2变更
-    */
+     * 档案操作类型1新增2变更
+     */
     private Integer operType;
     /**
-    * 归档状态0否1是
-    */
+     * 归档状态0否1是
+     */
     private Integer recordStatus;
     /**
-    * 二维码
-    */
+     * 二维码
+     */
     private String qRCode;
     /**
-    * 行业名称
-    */
+     * 行业名称
+     */
     private String industryName;
     /**
-    * 经营场所
-    */
+     * 经营场所
+     */
     private String businessPlace;
     /**
-    * 许可项目
-    */
+     * 许可项目
+     */
     private String licenseProject;
     /**
-    * 制证机关
-    */
+     * 制证机关
+     */
     private String authority;
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件地址
+     */
+    private String annexUrl;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -162,45 +170,47 @@ public class ApplyLogEntity extends ApplyLogVo {
         if (obj instanceof ApplyLogEntity) {
             ApplyLogEntity tmp = (ApplyLogEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.recordId = null;
-            this.catalogId = null;
-            this.catalogCode = "";
-            this.catalogName = "";
-            this.certificateCode = "";
-            this.certificateName = "";
-            this.issueTime = null;
-            this.pickerName = "";
-            this.pickerIDCardNo = "";
-            this.mobile = "";
-            this.holderType = 1;
-            this.holderIdType = 1;
-            this.holderName = "";
-            this.holderIDCardNo = "";
-            this.enterpriseName = "";
-            this.legalPerson = "";
-            this.socialCode = "";
-            this.validityStart = null;
-            this.validityEnd = null;
-            this.privateID = "";
-            this.certificateUrl = "";
-            this.previewUrl = "";
-            this.formContent = "";
-            this.formTemplate = "";
-            this.generateStatus = 1;
-            this.operType = 1;
-            this.recordStatus = 0;
-            this.qRCode = "";
-            this.industryName = "";
-            this.businessPlace = "";
-            this.licenseProject = "";
-            this.authority = "";
+        this.siteId = null;
+        this.recordId = null;
+        this.catalogId = null;
+        this.catalogCode = "";
+        this.catalogName = "";
+        this.certificateCode = "";
+        this.certificateName = "";
+        this.issueTime = null;
+        this.pickerName = "";
+        this.pickerIDCardNo = "";
+        this.mobile = "";
+        this.holderType = 1;
+        this.holderIdType = 1;
+        this.holderName = "";
+        this.holderIDCardNo = "";
+        this.enterpriseName = "";
+        this.legalPerson = "";
+        this.socialCode = "";
+        this.validityStart = null;
+        this.validityEnd = null;
+        this.privateID = "";
+        this.certificateUrl = "";
+        this.previewUrl = "";
+        this.formContent = "";
+        this.formTemplate = "";
+        this.generateStatus = 1;
+        this.operType = 1;
+        this.recordStatus = 0;
+        this.qRCode = "";
+        this.industryName = "";
+        this.businessPlace = "";
+        this.licenseProject = "";
+        this.authority = "";
+        this.annexName = "";
+        this.annexUrl = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

@@ -9,6 +9,8 @@ import com.mortals.framework.utils.poi.ExcelUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.ImportExcelUtil;
 import com.mortals.xhx.common.utils.ReadExcelPictureUtil;
@@ -39,6 +41,8 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
+import static java.util.stream.Collectors.toMap;
+
 /**
 *
 * 证照申请
@@ -55,6 +59,8 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
 
     @Autowired
     private CertificateDocumentService certificateDocumentService;
+    @Autowired
+    private UserService userService;
 
     public ApplyLogController(){
         super.setModuleDesc( "证照申请");
@@ -66,6 +72,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
         this.addDict(model,"holderType", IBaseEnum.getEnumMap(HolderType.class));
         this.addDict(model,"holderIdType", IBaseEnum.getEnumMap(HolderIdType.class));
         this.addDict(model,"generateStatus", IBaseEnum.getEnumMap(GenerateStatus.class));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }
 

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintLogController.java

@@ -4,6 +4,8 @@ import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.PrintStatus;
 import com.mortals.xhx.common.code.StatusEnum;
 import com.mortals.xhx.module.record.model.PrintLogEntity;
@@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+
+import static java.util.stream.Collectors.toMap;
+
 /**
 *
 * 证照打印记录
@@ -26,6 +31,8 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PrintLogController(){
         super.setModuleDesc( "证照打印记录");
@@ -35,6 +42,7 @@ public class PrintLogController extends BaseCRUDJsonBodyMappingController<PrintL
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model,"status", IBaseEnum.getEnumMap(StatusEnum.class));
         this.addDict(model,"printStatus", IBaseEnum.getEnumMap(PrintStatus.class));
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
     }