Bladeren bron

BasicInfo VO fill data logic

dengjia 3 maanden geleden
bovenliggende
commit
0a44a9d716
28 gewijzigde bestanden met toevoegingen van 1090 en 1642 verwijderingen
  1. 12 1
      src/main/java/org/example/mybatisplus/Controller/IndexController.java
  2. 0 24
      src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoCktItemMapper.java
  3. 0 24
      src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoCktMapper.java
  4. 0 24
      src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoDeclMapper.java
  5. 0 257
      src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCkt.java
  6. 0 344
      src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCktItem.java
  7. 84 0
      src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCktItemCategory.java
  8. 0 348
      src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoDecl.java
  9. 103 0
      src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheck.java
  10. 43 0
      src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheckBO.java
  11. 144 0
      src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheckItem.java
  12. 70 0
      src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoDeclaration.java
  13. 20 2
      src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskQxbInfoBO.java
  14. 39 0
      src/main/java/org/example/mybatisplus/model/auto/CommonLogicFineRuleModel.java
  15. 94 0
      src/main/java/org/example/mybatisplus/model/auto/CommonLogicModel.java
  16. 47 0
      src/main/java/org/example/mybatisplus/model/auto/CommonLogicRuleItem.java
  17. 360 0
      src/main/java/org/example/mybatisplus/model/auto/CommonType.java
  18. 48 0
      src/main/java/org/example/mybatisplus/model/auto/EasierCommonEntity.java
  19. 8 4
      src/main/java/org/example/mybatisplus/module/BasicInfo.java
  20. 13 0
      src/main/java/org/example/mybatisplus/module/vo/BasicInfoCheck.java
  21. 3 3
      src/main/java/org/example/mybatisplus/module/vo/BasicInfoScore.java
  22. 2 2
      src/main/java/org/example/mybatisplus/module/vo/SuperiorAuthority.java
  23. 0 79
      src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoCktItemService.java
  24. 0 79
      src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoCktService.java
  25. 0 79
      src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoDeclService.java
  26. 0 124
      src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoCktItemServiceImpl.java
  27. 0 124
      src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoCktServiceImpl.java
  28. 0 124
      src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoDeclServiceImpl.java

+ 12 - 1
src/main/java/org/example/mybatisplus/Controller/IndexController.java

@@ -4,6 +4,9 @@ import com.alibaba.fastjson2.JSONObject;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import org.example.mybatisplus.model.auto.CmsEnterpriseRiskInfoCheckBO;
+import org.example.mybatisplus.model.auto.CmsEnterpriseRiskInfoCheckItem;
+import org.example.mybatisplus.model.auto.CmsEnterpriseRiskInfoDeclaration;
 import org.example.mybatisplus.model.auto.CmsEnterpriseRiskQxbInfoBO;
 import org.example.mybatisplus.module.BasicInfo;
 import org.example.mybatisplus.tools.WordPoiExporter;
@@ -16,6 +19,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 @ApiOperation("控制类")
 @RestController
@@ -23,7 +29,7 @@ public class IndexController {
 
     //只要接口中,返回值存在实体类,就会被扫描到swagger中
     @GetMapping("/export")
-    public ResponseEntity<Resource> export(@ApiParam("param")String param /* todo: 参数:服务商ID,报告类型*/){
+    public ResponseEntity<Resource> export(@ApiParam("param")String param /* todo: 参数:服务商ID,校验ID,报告类型*/){
 
         String wordFilePath = System.getProperty("user.dir")+File.separator+ "jijinhui.docx";
         String wordExportpath = System.getProperty("user.dir")+File.separator+ "jijinhui1.docx";
@@ -34,9 +40,14 @@ public class IndexController {
         // 2. retrieve data
         //    2.1 get CmsEnterpriseRiskQxbInfoBO
         CmsEnterpriseRiskQxbInfoBO cmsEnterpriseRiskQxbInfoBO = org.example.mybatisplus.model.auto.CmsEnterpriseRiskQxbInfoBO.builder().build(); // mock
+        CmsEnterpriseRiskInfoDeclaration cmsEnterpriseRiskInfoDeclaration = new CmsEnterpriseRiskInfoDeclaration(); // mock
+        CmsEnterpriseRiskInfoCheckBO cmsEnterpriseRiskInfoCheckBO = new CmsEnterpriseRiskInfoCheckBO();
         // 3. fill BasicInfo
         BasicInfo basicInfo = new BasicInfo();
         cmsEnterpriseRiskQxbInfoBO.fillBasicInfoVO(basicInfo);
+        cmsEnterpriseRiskInfoDeclaration.fillBasicInfoVO(basicInfo);
+        cmsEnterpriseRiskInfoCheckBO.fillBasicInfoVO(basicInfo);
+
         // 4. render WordTemplate with BasicInfo
 
         // ...

+ 0 - 24
src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoCktItemMapper.java

@@ -1,24 +0,0 @@
-package org.example.mybatisplus.mapper.auto;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCktItem;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 企业风险检查项Mapper接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:27
- */
-public interface CmsEntRiskInfoCktItemMapper extends BaseMapper<CmsEntRiskInfoCktItem>
-{
-                                                                                                                                                                                                                                                                                                                
-    /**
-     * 查询企业风险检查项列表
-     *
-     * @param cmsEntRiskInfoCktItem
-     * @return CmsEntRiskInfoCktItem集合
-     */
-    public List<CmsEntRiskInfoCktItem> selectCmsEntRiskInfoCktItemList(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem);
-}

+ 0 - 24
src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoCktMapper.java

@@ -1,24 +0,0 @@
-package org.example.mybatisplus.mapper.auto;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCkt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 企业风险信息校验Mapper接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:35
- */
-public interface CmsEntRiskInfoCktMapper extends BaseMapper<CmsEntRiskInfoCkt>
-{
-                                                                                                                                                                                                                            
-    /**
-     * 查询企业风险信息校验列表
-     *
-     * @param cmsEntRiskInfoCkt
-     * @return CmsEntRiskInfoCkt集合
-     */
-    public List<CmsEntRiskInfoCkt> selectCmsEntRiskInfoCktList(CmsEntRiskInfoCkt cmsEntRiskInfoCkt);
-}

+ 0 - 24
src/main/java/org/example/mybatisplus/mapper/auto/CmsEntRiskInfoDeclMapper.java

@@ -1,24 +0,0 @@
-package org.example.mybatisplus.mapper.auto;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoDecl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 企业风险信息申报Mapper接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:37
- */
-public interface CmsEntRiskInfoDeclMapper extends BaseMapper<CmsEntRiskInfoDecl>
-{
-                                                                                                                                                                                                                                                                                                                
-    /**
-     * 查询企业风险信息申报列表
-     *
-     * @param cmsEntRiskInfoDecl
-     * @return CmsEntRiskInfoDecl集合
-     */
-    public List<CmsEntRiskInfoDecl> selectCmsEntRiskInfoDeclList(CmsEntRiskInfoDecl cmsEntRiskInfoDecl);
-}

+ 0 - 257
src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCkt.java

@@ -1,257 +0,0 @@
-package org.example.mybatisplus.model.auto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
-
-
-/**
- * 企业风险信息校验对象 cms_ent_risk_info_ckt
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:35
- */
-@TableName("cms_ent_risk_info_ckt")
-public class CmsEntRiskInfoCkt  {
-
-	private static final long serialVersionUID = 1L;
-
-	/** 主键 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	private Long cktId;
-
-	/** 关联ID */
-	@ApiModelProperty(value = "关联ID")
-	private Long relId;
-
-	/** 审核状态 */
-	@ApiModelProperty(value = "审核状态")
-	private String cktState;
-	/** 审核时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "审核时间")
-	private Date checkTime;
-	/** 信息刷新时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "信息刷新时间")
-	private Date refreshTime;
-
-	/** 审核报告地址 */
-	@ApiModelProperty(value = "审核报告地址")
-	private String reportUrl;
-
-	/** 审核签名 */
-	@ApiModelProperty(value = "审核签名")
-	private String signedBy;
-
-	/** 建议 */
-	@ApiModelProperty(value = "建议")
-	private String advice;
-
-	/** 综述 */
-	@ApiModelProperty(value = "综述")
-	private String review;
-
-	/** 准入标准ID */
-	@ApiModelProperty(value = "准入标准ID")
-	private Long standardId;
-
-	/** 备注 */
-	@ApiModelProperty(value = "备注")
-	private String remarks;
-
-	/** 删除标记 */
-	@ApiModelProperty(value = "删除标记")
-	private String delFlag;
-
-	/** 所属租户 */
-	@ApiModelProperty(value = "所属租户")
-	private Long tenantId;
-
-	/** 创建人 */
-	@ApiModelProperty(value = "创建人")
-	private String createdBy;
-
-	/** 修改人 */
-	@ApiModelProperty(value = "修改人")
-	private String modifiedBy;
-	/** 创建时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createdTime;
-	/** 修改时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "修改时间")
-	private Date modifiedTime;
-	
-	@JsonProperty("cktId")
-	public Long getCktId() {
-		return cktId;
-	}
-
-	public void setCktId(Long cktId) {
-		this.cktId =  cktId;
-	}
-	@JsonProperty("relId")
-	public Long getRelId() {
-		return relId;
-	}
-
-	public void setRelId(Long relId) {
-		this.relId =  relId;
-	}
-	@JsonProperty("cktState")
-	public String getCktState() {
-		return cktState;
-	}
-
-	public void setCktState(String cktState) {
-		this.cktState =  cktState;
-	}
-	@JsonProperty("checkTime")
-	public Date getCheckTime() {
-		return checkTime;
-	}
-
-	public void setCheckTime(Date checkTime) {
-		this.checkTime =  checkTime;
-	}
-	@JsonProperty("refreshTime")
-	public Date getRefreshTime() {
-		return refreshTime;
-	}
-
-	public void setRefreshTime(Date refreshTime) {
-		this.refreshTime =  refreshTime;
-	}
-	@JsonProperty("reportUrl")
-	public String getReportUrl() {
-		return reportUrl;
-	}
-
-	public void setReportUrl(String reportUrl) {
-		this.reportUrl =  reportUrl;
-	}
-	@JsonProperty("signedBy")
-	public String getSignedBy() {
-		return signedBy;
-	}
-
-	public void setSignedBy(String signedBy) {
-		this.signedBy =  signedBy;
-	}
-	@JsonProperty("advice")
-	public String getAdvice() {
-		return advice;
-	}
-
-	public void setAdvice(String advice) {
-		this.advice =  advice;
-	}
-	@JsonProperty("review")
-	public String getReview() {
-		return review;
-	}
-
-	public void setReview(String review) {
-		this.review =  review;
-	}
-	@JsonProperty("standardId")
-	public Long getStandardId() {
-		return standardId;
-	}
-
-	public void setStandardId(Long standardId) {
-		this.standardId =  standardId;
-	}
-	@JsonProperty("remarks")
-	public String getRemarks() {
-		return remarks;
-	}
-
-	public void setRemarks(String remarks) {
-		this.remarks =  remarks;
-	}
-	@JsonProperty("delFlag")
-	public String getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(String delFlag) {
-		this.delFlag =  delFlag;
-	}
-	@JsonProperty("tenantId")
-	public Long getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Long tenantId) {
-		this.tenantId =  tenantId;
-	}
-	@JsonProperty("createdBy")
-	public String getCreatedBy() {
-		return createdBy;
-	}
-
-	public void setCreatedBy(String createdBy) {
-		this.createdBy =  createdBy;
-	}
-	@JsonProperty("modifiedBy")
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy =  modifiedBy;
-	}
-	@JsonProperty("createdTime")
-	public Date getCreatedTime() {
-		return createdTime;
-	}
-
-	public void setCreatedTime(Date createdTime) {
-		this.createdTime =  createdTime;
-	}
-	@JsonProperty("modifiedTime")
-	public Date getModifiedTime() {
-		return modifiedTime;
-	}
-
-	public void setModifiedTime(Date modifiedTime) {
-		this.modifiedTime =  modifiedTime;
-	}
-
-																																		
-	public CmsEntRiskInfoCkt(Long cktId,Long relId,String cktState,Date checkTime,Date refreshTime,String reportUrl,String signedBy,String advice,String review,Long standardId,String remarks,String delFlag,Long tenantId,String createdBy,String modifiedBy,Date createdTime,Date modifiedTime) {
-		this.cktId = cktId;
-		this.relId = relId;
-		this.cktState = cktState;
-		this.checkTime = checkTime;
-		this.refreshTime = refreshTime;
-		this.reportUrl = reportUrl;
-		this.signedBy = signedBy;
-		this.advice = advice;
-		this.review = review;
-		this.standardId = standardId;
-		this.remarks = remarks;
-		this.delFlag = delFlag;
-		this.tenantId = tenantId;
-		this.createdBy = createdBy;
-		this.modifiedBy = modifiedBy;
-		this.createdTime = createdTime;
-		this.modifiedTime = modifiedTime;
-	}
-
-	public CmsEntRiskInfoCkt() {
-	    super();
-	}
-
-
-}

+ 0 - 344
src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCktItem.java

@@ -1,344 +0,0 @@
-package org.example.mybatisplus.model.auto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.baomidou.mybatisplus.annotation.*;
-import java.util.Date;
-
-/**
- * 企业风险检查项对象 cms_ent_risk_info_ckt_item
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:27
- */
-@TableName("cms_ent_risk_info_ckt_item")
-public class CmsEntRiskInfoCktItem  {
-
-	private static final long serialVersionUID = 1L;
-
-	/** 主键 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	private Long itemId;
-
-	/** 校验ID */
-	@ApiModelProperty(value = "校验ID")
-	private Long checkId;
-
-	/** 校验项标签 */
-	@ApiModelProperty(value = "校验项标签")
-	private String itemLabel;
-
-	/** 校验项名称 */
-	@ApiModelProperty(value = "校验项名称")
-	private String itemName;
-
-	/** 校验项描述 */
-	@ApiModelProperty(value = "校验项描述")
-	private String itemDesc;
-
-	/** 校验类型 */
-	@ApiModelProperty(value = "校验类型")
-	private String cktType;
-
-	/** 校验值 */
-	@ApiModelProperty(value = "校验值")
-	private String actVal;
-
-	/** 逻辑类型 */
-	@ApiModelProperty(value = "逻辑类型")
-	private String logicType;
-
-	/** 分类(审查范围) */
-	@ApiModelProperty(value = "分类(审查范围)")
-	private String categoryType;
-
-	/** 目标值 */
-	@ApiModelProperty(value = "目标值")
-	private String tarVal;
-
-	/** 自动审核结果 */
-	@ApiModelProperty(value = "自动审核结果")
-	private Integer autoResult;
-
-	/** 自动审核结果信息 */
-	@ApiModelProperty(value = "自动审核结果信息")
-	private String autoMsg;
-
-	/** 人工审核结果 */
-	@ApiModelProperty(value = "人工审核结果")
-	private Integer manualResult;
-
-	/** 人工审核信息 */
-	@ApiModelProperty(value = "人工审核信息")
-	private String manualMsg;
-
-	/** 分值 */
-	@ApiModelProperty(value = "分值")
-	private Long score;
-
-	/** 得分 */
-	@ApiModelProperty(value = "得分")
-	private Long autoScore;
-
-	/** 复核得分 */
-	@ApiModelProperty(value = "复核得分")
-	private Long manualScore;
-
-	/** 精细化评分规则 */
-	@ApiModelProperty(value = "精细化评分规则")
-	private String fineRule;
-
-	/** 备注 */
-	@ApiModelProperty(value = "备注")
-	private String remarks;
-
-	/** 删除标记 */
-	@ApiModelProperty(value = "删除标记")
-	private String delFlag;
-
-	/** 创建人 */
-	@ApiModelProperty(value = "创建人")
-	private String createdBy;
-
-	/** 修改人 */
-	@ApiModelProperty(value = "修改人")
-	private String modifiedBy;
-	/** 创建时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createdTime;
-	/** 修改时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "修改时间")
-	private Date modifiedTime;
-	
-	@JsonProperty("itemId")
-	public Long getItemId() {
-		return itemId;
-	}
-
-	public void setItemId(Long itemId) {
-		this.itemId =  itemId;
-	}
-	@JsonProperty("checkId")
-	public Long getCheckId() {
-		return checkId;
-	}
-
-	public void setCheckId(Long checkId) {
-		this.checkId =  checkId;
-	}
-	@JsonProperty("itemLabel")
-	public String getItemLabel() {
-		return itemLabel;
-	}
-
-	public void setItemLabel(String itemLabel) {
-		this.itemLabel =  itemLabel;
-	}
-	@JsonProperty("itemName")
-	public String getItemName() {
-		return itemName;
-	}
-
-	public void setItemName(String itemName) {
-		this.itemName =  itemName;
-	}
-	@JsonProperty("itemDesc")
-	public String getItemDesc() {
-		return itemDesc;
-	}
-
-	public void setItemDesc(String itemDesc) {
-		this.itemDesc =  itemDesc;
-	}
-	@JsonProperty("cktType")
-	public String getCktType() {
-		return cktType;
-	}
-
-	public void setCktType(String cktType) {
-		this.cktType =  cktType;
-	}
-	@JsonProperty("actVal")
-	public String getActVal() {
-		return actVal;
-	}
-
-	public void setActVal(String actVal) {
-		this.actVal =  actVal;
-	}
-	@JsonProperty("logicType")
-	public String getLogicType() {
-		return logicType;
-	}
-
-	public void setLogicType(String logicType) {
-		this.logicType =  logicType;
-	}
-	@JsonProperty("categoryType")
-	public String getCategoryType() {
-		return categoryType;
-	}
-
-	public void setCategoryType(String categoryType) {
-		this.categoryType =  categoryType;
-	}
-	@JsonProperty("tarVal")
-	public String getTarVal() {
-		return tarVal;
-	}
-
-	public void setTarVal(String tarVal) {
-		this.tarVal =  tarVal;
-	}
-	@JsonProperty("autoResult")
-	public Integer getAutoResult() {
-		return autoResult;
-	}
-
-	public void setAutoResult(Integer autoResult) {
-		this.autoResult =  autoResult;
-	}
-	@JsonProperty("autoMsg")
-	public String getAutoMsg() {
-		return autoMsg;
-	}
-
-	public void setAutoMsg(String autoMsg) {
-		this.autoMsg =  autoMsg;
-	}
-	@JsonProperty("manualResult")
-	public Integer getManualResult() {
-		return manualResult;
-	}
-
-	public void setManualResult(Integer manualResult) {
-		this.manualResult =  manualResult;
-	}
-	@JsonProperty("manualMsg")
-	public String getManualMsg() {
-		return manualMsg;
-	}
-
-	public void setManualMsg(String manualMsg) {
-		this.manualMsg =  manualMsg;
-	}
-	@JsonProperty("score")
-	public Long getScore() {
-		return score;
-	}
-
-	public void setScore(Long score) {
-		this.score =  score;
-	}
-	@JsonProperty("autoScore")
-	public Long getAutoScore() {
-		return autoScore;
-	}
-
-	public void setAutoScore(Long autoScore) {
-		this.autoScore =  autoScore;
-	}
-	@JsonProperty("manualScore")
-	public Long getManualScore() {
-		return manualScore;
-	}
-
-	public void setManualScore(Long manualScore) {
-		this.manualScore =  manualScore;
-	}
-	@JsonProperty("fineRule")
-	public String getFineRule() {
-		return fineRule;
-	}
-
-	public void setFineRule(String fineRule) {
-		this.fineRule =  fineRule;
-	}
-	@JsonProperty("remarks")
-	public String getRemarks() {
-		return remarks;
-	}
-
-	public void setRemarks(String remarks) {
-		this.remarks =  remarks;
-	}
-	@JsonProperty("delFlag")
-	public String getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(String delFlag) {
-		this.delFlag =  delFlag;
-	}
-	@JsonProperty("createdBy")
-	public String getCreatedBy() {
-		return createdBy;
-	}
-
-	public void setCreatedBy(String createdBy) {
-		this.createdBy =  createdBy;
-	}
-	@JsonProperty("modifiedBy")
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy =  modifiedBy;
-	}
-	@JsonProperty("createdTime")
-	public Date getCreatedTime() {
-		return createdTime;
-	}
-
-	public void setCreatedTime(Date createdTime) {
-		this.createdTime =  createdTime;
-	}
-	@JsonProperty("modifiedTime")
-	public Date getModifiedTime() {
-		return modifiedTime;
-	}
-
-	public void setModifiedTime(Date modifiedTime) {
-		this.modifiedTime =  modifiedTime;
-	}
-
-																																																
-	public CmsEntRiskInfoCktItem(Long itemId,Long checkId,String itemLabel,String itemName,String itemDesc,String cktType,String actVal,String logicType,String categoryType,String tarVal,Integer autoResult,String autoMsg,Integer manualResult,String manualMsg,Long score,Long autoScore,Long manualScore,String fineRule,String remarks,String delFlag,String createdBy,String modifiedBy,Date createdTime,Date modifiedTime) {
-		this.itemId = itemId;
-		this.checkId = checkId;
-		this.itemLabel = itemLabel;
-		this.itemName = itemName;
-		this.itemDesc = itemDesc;
-		this.cktType = cktType;
-		this.actVal = actVal;
-		this.logicType = logicType;
-		this.categoryType = categoryType;
-		this.tarVal = tarVal;
-		this.autoResult = autoResult;
-		this.autoMsg = autoMsg;
-		this.manualResult = manualResult;
-		this.manualMsg = manualMsg;
-		this.score = score;
-		this.autoScore = autoScore;
-		this.manualScore = manualScore;
-		this.fineRule = fineRule;
-		this.remarks = remarks;
-		this.delFlag = delFlag;
-		this.createdBy = createdBy;
-		this.modifiedBy = modifiedBy;
-		this.createdTime = createdTime;
-		this.modifiedTime = modifiedTime;
-	}
-
-	public CmsEntRiskInfoCktItem() {
-	    super();
-	}
-}

+ 84 - 0
src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoCktItemCategory.java

@@ -0,0 +1,84 @@
+package org.example.mybatisplus.model.auto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 企业风险检查项分类
+ *
+ * @author snows
+ * @date 2024/12/08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "cms_ent_risk_info_ckt_item_category")
+public class CmsEntRiskInfoCktItemCategory extends EasierCommonEntity {
+    private static final long serialVersionUID = 812705647520492435L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long categoryId;
+
+    /**
+     * 审核ID
+     */
+    private Long checkId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 分类标签
+     */
+    private String categoryLabel;
+
+    /**
+     * 是否开启评分
+     */
+    private Boolean scoreFlag;
+
+    /**
+     * 分值
+     */
+    private Long score;
+
+    /**
+     * 是否填写专业意见
+     */
+    private Boolean cktFlag;
+
+    /**
+     * 风险综述
+     */
+    private String cktReview;
+
+    /**
+     * 风险建议
+     */
+    private String cktMsg;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 删除结果
+     */
+
+    /**
+     * 权重排序
+     */
+    private Long weight;
+}

+ 0 - 348
src/main/java/org/example/mybatisplus/model/auto/CmsEntRiskInfoDecl.java

@@ -1,348 +0,0 @@
-package org.example.mybatisplus.model.auto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
-
-
-/**
- * 企业风险信息申报对象 cms_ent_risk_info_decl
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:37
- */
-@TableName("cms_ent_risk_info_decl")
-public class CmsEntRiskInfoDecl  {
-
-	private static final long serialVersionUID = 1L;
-
-	/** 主键 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	private Long declId;
-
-	/** 企业名称 */
-	@ApiModelProperty(value = "企业名称")
-	private String entName;
-
-	/** 企业三合一码 */
-	@ApiModelProperty(value = "企业三合一码")
-	private String regCode;
-
-	/** 申报编号 */
-	@ApiModelProperty(value = "申报编号")
-	private String declSn;
-
-	/** 申报类型 */
-	@ApiModelProperty(value = "申报类型")
-	private String declType;
-
-	/** 申报地址 */
-	@ApiModelProperty(value = "申报地址")
-	private String declUrl;
-
-	/** 提取码 */
-	@ApiModelProperty(value = "提取码")
-	private String secretKey;
-	/** 申报开始时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "申报开始时间")
-	private Date issueDate;
-	/** 申报截止时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "申报截止时间")
-	private Date expiryDate;
-
-	/** 申报状态 */
-	@ApiModelProperty(value = "申报状态")
-	private String declState;
-
-	/** 打开信息 */
-	@ApiModelProperty(value = "打开信息")
-	private String openInfo;
-
-	/** 提交信息 */
-	@ApiModelProperty(value = "提交信息")
-	private String submitInfo;
-
-	/** 评价信息 */
-	@ApiModelProperty(value = "评价信息")
-	private String checkInfo;
-
-	/** 表单结构 */
-	@ApiModelProperty(value = "表单结构")
-	private String formItems;
-
-	/** 申报结果 */
-	@ApiModelProperty(value = "申报结果")
-	private String declResult;
-
-	/** 邀约人信息 */
-	@ApiModelProperty(value = "邀约人信息")
-	private String declSender;
-
-	/** 诶邀约人信息 */
-	@ApiModelProperty(value = "诶邀约人信息")
-	private String declRecipient;
-
-	/** 关联ID */
-	@ApiModelProperty(value = "关联ID")
-	private Long parentId;
-
-	/** 部门ID */
-	@ApiModelProperty(value = "部门ID")
-	private Long deptId;
-
-	/** 所属租户 */
-	@ApiModelProperty(value = "所属租户")
-	private Long tenantId;
-
-	/** 创建人 */
-	@ApiModelProperty(value = "创建人")
-	private String createdBy;
-
-	/** 修改人 */
-	@ApiModelProperty(value = "修改人")
-	private String modifiedBy;
-	/** 创建时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createdTime;
-	/** 修改时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "修改时间")
-	private Date modifiedTime;
-	
-	@JsonProperty("declId")
-	public Long getDeclId() {
-		return declId;
-	}
-
-	public void setDeclId(Long declId) {
-		this.declId =  declId;
-	}
-	@JsonProperty("entName")
-	public String getEntName() {
-		return entName;
-	}
-
-	public void setEntName(String entName) {
-		this.entName =  entName;
-	}
-	@JsonProperty("regCode")
-	public String getRegCode() {
-		return regCode;
-	}
-
-	public void setRegCode(String regCode) {
-		this.regCode =  regCode;
-	}
-	@JsonProperty("declSn")
-	public String getDeclSn() {
-		return declSn;
-	}
-
-	public void setDeclSn(String declSn) {
-		this.declSn =  declSn;
-	}
-	@JsonProperty("declType")
-	public String getDeclType() {
-		return declType;
-	}
-
-	public void setDeclType(String declType) {
-		this.declType =  declType;
-	}
-	@JsonProperty("declUrl")
-	public String getDeclUrl() {
-		return declUrl;
-	}
-
-	public void setDeclUrl(String declUrl) {
-		this.declUrl =  declUrl;
-	}
-	@JsonProperty("secretKey")
-	public String getSecretKey() {
-		return secretKey;
-	}
-
-	public void setSecretKey(String secretKey) {
-		this.secretKey =  secretKey;
-	}
-	@JsonProperty("issueDate")
-	public Date getIssueDate() {
-		return issueDate;
-	}
-
-	public void setIssueDate(Date issueDate) {
-		this.issueDate =  issueDate;
-	}
-	@JsonProperty("expiryDate")
-	public Date getExpiryDate() {
-		return expiryDate;
-	}
-
-	public void setExpiryDate(Date expiryDate) {
-		this.expiryDate =  expiryDate;
-	}
-	@JsonProperty("declState")
-	public String getDeclState() {
-		return declState;
-	}
-
-	public void setDeclState(String declState) {
-		this.declState =  declState;
-	}
-	@JsonProperty("openInfo")
-	public String getOpenInfo() {
-		return openInfo;
-	}
-
-	public void setOpenInfo(String openInfo) {
-		this.openInfo =  openInfo;
-	}
-	@JsonProperty("submitInfo")
-	public String getSubmitInfo() {
-		return submitInfo;
-	}
-
-	public void setSubmitInfo(String submitInfo) {
-		this.submitInfo =  submitInfo;
-	}
-	@JsonProperty("checkInfo")
-	public String getCheckInfo() {
-		return checkInfo;
-	}
-
-	public void setCheckInfo(String checkInfo) {
-		this.checkInfo =  checkInfo;
-	}
-	@JsonProperty("formItems")
-	public String getFormItems() {
-		return formItems;
-	}
-
-	public void setFormItems(String formItems) {
-		this.formItems =  formItems;
-	}
-	@JsonProperty("declResult")
-	public String getDeclResult() {
-		return declResult;
-	}
-
-	public void setDeclResult(String declResult) {
-		this.declResult =  declResult;
-	}
-	@JsonProperty("declSender")
-	public String getDeclSender() {
-		return declSender;
-	}
-
-	public void setDeclSender(String declSender) {
-		this.declSender =  declSender;
-	}
-	@JsonProperty("declRecipient")
-	public String getDeclRecipient() {
-		return declRecipient;
-	}
-
-	public void setDeclRecipient(String declRecipient) {
-		this.declRecipient =  declRecipient;
-	}
-	@JsonProperty("parentId")
-	public Long getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(Long parentId) {
-		this.parentId =  parentId;
-	}
-	@JsonProperty("deptId")
-	public Long getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(Long deptId) {
-		this.deptId =  deptId;
-	}
-	@JsonProperty("tenantId")
-	public Long getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Long tenantId) {
-		this.tenantId =  tenantId;
-	}
-	@JsonProperty("createdBy")
-	public String getCreatedBy() {
-		return createdBy;
-	}
-
-	public void setCreatedBy(String createdBy) {
-		this.createdBy =  createdBy;
-	}
-	@JsonProperty("modifiedBy")
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy =  modifiedBy;
-	}
-	@JsonProperty("createdTime")
-	public Date getCreatedTime() {
-		return createdTime;
-	}
-
-	public void setCreatedTime(Date createdTime) {
-		this.createdTime =  createdTime;
-	}
-	@JsonProperty("modifiedTime")
-	public Date getModifiedTime() {
-		return modifiedTime;
-	}
-
-	public void setModifiedTime(Date modifiedTime) {
-		this.modifiedTime =  modifiedTime;
-	}
-
-																																																
-	public CmsEntRiskInfoDecl(Long declId,String entName,String regCode,String declSn,String declType,String declUrl,String secretKey,Date issueDate,Date expiryDate,String declState,String openInfo,String submitInfo,String checkInfo,String formItems,String declResult,String declSender,String declRecipient,Long parentId,Long deptId,Long tenantId,String createdBy,String modifiedBy,Date createdTime,Date modifiedTime) {
-		this.declId = declId;
-		this.entName = entName;
-		this.regCode = regCode;
-		this.declSn = declSn;
-		this.declType = declType;
-		this.declUrl = declUrl;
-		this.secretKey = secretKey;
-		this.issueDate = issueDate;
-		this.expiryDate = expiryDate;
-		this.declState = declState;
-		this.openInfo = openInfo;
-		this.submitInfo = submitInfo;
-		this.checkInfo = checkInfo;
-		this.formItems = formItems;
-		this.declResult = declResult;
-		this.declSender = declSender;
-		this.declRecipient = declRecipient;
-		this.parentId = parentId;
-		this.deptId = deptId;
-		this.tenantId = tenantId;
-		this.createdBy = createdBy;
-		this.modifiedBy = modifiedBy;
-		this.createdTime = createdTime;
-		this.modifiedTime = modifiedTime;
-	}
-
-	public CmsEntRiskInfoDecl() {
-	    super();
-	}
-
-}

+ 103 - 0
src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheck.java

@@ -0,0 +1,103 @@
+package org.example.mybatisplus.model.auto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业风险信息校验
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2024/02/26 10:38
+ */
+@Data
+@TableName(value = "cms_ent_risk_info_ckt")
+public final class CmsEnterpriseRiskInfoCheck extends EasierCommonEntity {
+
+    private static final long serialVersionUID = 6366186033343435807L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ckt_id", type = IdType.ASSIGN_ID)
+    private Long checkId;
+
+    /**
+     * 关联关系ID
+     */
+    @TableField(value = "rel_id")
+    private Long relationId;
+
+    /**
+     * 审核状态
+     */
+    @TableField(value = "ckt_state")
+    private String checkState;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime checkTime;
+
+    /**
+     * 关联关系刷新时间
+     */
+    @TableField(value = "refresh_time")
+    private LocalDateTime relationRefreshTime;
+
+    /**
+     * 报告地址
+     */
+    private String reportUrl;
+
+    /**
+     * 审核人签名
+     */
+    private String signedBy;
+
+    /**
+     * 建议
+     */
+    private String advice;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 综述
+     */
+    private String review;
+
+    /**
+     * 删除状态
+     */
+    /**
+     * 准入标准ID
+     */
+    private Long standardId;
+
+    /**
+     * 审核租户ID
+     */
+    private Long checkTenantId;
+
+    /**
+     * 审核用户ID
+     */
+    private Long checkUserId;
+
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
+}

+ 43 - 0
src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheckBO.java

@@ -0,0 +1,43 @@
+package org.example.mybatisplus.model.auto;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.example.mybatisplus.module.BasicInfo;
+import org.example.mybatisplus.module.vo.BasicInfoCheck;
+import org.example.mybatisplus.module.vo.BasicInfoScore;
+
+import lombok.Data;
+
+@Data
+public class CmsEnterpriseRiskInfoCheckBO {
+    // key: checkItemLabel
+    private Map<String, CmsEnterpriseRiskInfoCheckItem> mpCmsEnterpriseRiskInfoCheckItem =
+        Collections.emptyMap();
+    private CmsEnterpriseRiskInfoCheck cmsEnterpriseRiskInfoCheck =
+        new CmsEnterpriseRiskInfoCheck();
+    private Map<String, CmsEntRiskInfoCktItemCategory> mpCmsEntRiskInfoCktItemCategory =
+        Collections.emptyMap();
+
+    public void fillBasicInfoVO(BasicInfo basicInfo) {
+        List<BasicInfoCheck> checks = new ArrayList<>();
+        for(String label: new String[] {"donation_revenue_scale", "net_worth_rating", "operation_years", "moca_rating"}) {
+            BasicInfoCheck check = new BasicInfoCheck();
+            check.setName(mpCmsEnterpriseRiskInfoCheckItem.get(label).getItemName());
+            check.setDesc(mpCmsEnterpriseRiskInfoCheckItem.get(label).getDescription());
+            check.setFact(mpCmsEnterpriseRiskInfoCheckItem.get(label).getActualValue());
+            check.setResult(mpCmsEnterpriseRiskInfoCheckItem.get(label).getBizResultStr());
+            check.setScore(mpCmsEnterpriseRiskInfoCheckItem.get(label).getScore());
+            checks.add(check);
+        }
+        basicInfo.setBasicInfoChecks(checks);
+        
+        basicInfo.setBasicInfoScore(new BasicInfoScore(
+            mpCmsEntRiskInfoCktItemCategory.get("BASIC").getScore(),
+            cmsEnterpriseRiskInfoCheck.getRemarks(),
+            cmsEnterpriseRiskInfoCheck.getAdvice()
+        ));
+    }
+}

+ 144 - 0
src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoCheckItem.java

@@ -0,0 +1,144 @@
+package org.example.mybatisplus.model.auto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业风险信息校验项
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2024/04/13 15:18
+ */
+@Data
+@TableName(value = "cms_ent_risk_info_ckt_item", autoResultMap = true)
+public final class CmsEnterpriseRiskInfoCheckItem extends EasierCommonEntity {
+    private static final long serialVersionUID = 8779626915057605240L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long itemId;
+
+    /**
+     * 校验ID
+     */
+    private Long checkId;
+
+    /**
+     * 校验项标签
+     */
+    private String itemLabel;
+
+    /**
+     * 校验项名称
+     */
+    private String itemName;
+
+    /**
+     * 校验项描述
+     */
+    @TableField(value = "item_desc")
+    private String description;
+
+    /**
+     * 分类(审查范围)
+     */
+    private String categoryType;
+
+    /**
+     * 校验值
+     */
+    @TableField(value = "act_val")
+    private String actualValue;
+
+    /**
+     * 目标值
+     */
+    @TableField(value = "tar_val")
+    private String targetValue;
+
+    /**
+     * 逻辑类型
+     */
+    private CommonType.LogicType logicType;
+
+    /**
+     * 自动审核结果
+     */
+    private Boolean autoResult;
+
+    /**
+     * 自动审核结果信息
+     */
+    private String autoMsg;
+
+    /**
+     * 人工审核结果
+     */
+    private Boolean manualResult;
+
+    /**
+     * 人工审核信息
+     */
+    private String manualMsg;
+
+    /**
+     * 分值
+     */
+    private Long score;
+
+    /**
+     * 得分
+     */
+    private Long autoScore;
+
+    /**
+     * 复核得分
+     */
+    private Long manualScore;
+
+    /**
+     * 精细化评分规则
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private CommonLogicFineRuleModel fineRule;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 人工审核租户ID
+     */
+    private Long manualCheckTenantId;
+
+    /**
+     * 人工审核用户ID
+     */
+    private Long manualCheckUserId;
+
+    /**
+     * 人工审核时间
+     */
+    private LocalDateTime manualCheckTime;
+
+    public Boolean getBizResult() {
+        return manualResult == null ? manualResult : autoResult;
+    }
+
+    public String getBizResultStr() {
+        return getBizResult() ? "合格" : "不合格";
+    }
+}

+ 70 - 0
src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskInfoDeclaration.java

@@ -0,0 +1,70 @@
+package org.example.mybatisplus.model.auto;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.example.mybatisplus.module.BasicInfo;
+import org.example.mybatisplus.module.vo.Attachment;
+
+public class CmsEnterpriseRiskInfoDeclaration {
+
+    public void fillBasicInfoVO(BasicInfo basicInfo) {
+		basicInfo.setEvaluationLevel(
+            getDelcEndWithInfo("基金会评估等级", Collections.singletonList(this))
+            .toString());
+        basicInfo.setOfficialWebsite(
+            getDelcEndWithInfo("机构官网地址", Collections.singletonList(this))
+            .toString());
+        basicInfo.setFoundationCategory(
+            getDelcEndWithInfo("基金会类别", Collections.singletonList(this))
+            .toString());
+        basicInfo.setInstitutionPurpose(
+            getDelcEndWithInfo("机构宗旨", Collections.singletonList(this))
+            .toString());
+        basicInfo.setLastYearSponsorshipDonationRatio(
+            getDelcEndWithInfo("赞助和捐赠额占总社会赞助和捐赠比例(%)", Collections.singletonList(this))
+            .toString());
+        basicInfo.setLastYearDonationIncome(
+            getDelcEndWithInfo("最近一年捐赠收入", Collections.singletonList(this))
+            .toString() + "(万元人民币)");
+        basicInfo.setInitialFund(
+            getDelcEndWithInfo("原始基金", Collections.singletonList(this))
+            .toString());
+        basicInfo.setOfficeAddress(
+            getDelcEndWithInfo("营运地址", Collections.singletonList(this))
+            .toString());
+        basicInfo.setContactPhone(
+            getDelcEndWithInfo("机构有效联系电话", Collections.singletonList(this))
+            .toString());
+        basicInfo.setFullTimeStaffCount(Integer.valueOf(
+            getDelcEndWithInfo("机构全职员工人数", Collections.singletonList(this))
+            .toString()));
+        basicInfo.setNeedOutsourcingService(
+            getDelcEndWithInfo("是否通常需要使用其他协会、基金会或供应商对合作项目进行外包服务", Collections.singletonList(this))
+            .toString());
+        basicInfo.setProjectServiceVendors(
+            getDelcEndWithInfo("请提供项目服务执行方名单(如名单较多,可单独提供副本)", Collections.singletonList(this))
+            .toString());
+        // todo: 从oss url解析字段
+        Attachment attach = new Attachment();
+        attach.setFilePath(getDelcFileUrl("关联实体情况", Collections.singletonList(this)));
+        basicInfo.setRelatedEntitiesImage(attach);
+        basicInfo.setFoundationCertReceived(
+            getDelcFileUrl("基金会法人登记证书", Collections.singletonList(this))
+            .toString().length() > 3 ? "是" : "否");
+        basicInfo.setBankLicense(
+            getDelcEndWithInfo("银行开户许可证", Collections.singletonList(this))
+            .toString().length() > 3 ? "是" : "否");
+        basicInfo.setAnnualInspectionResult(
+            getDelcEndWithInfo("年检结果", Collections.singletonList(this))
+            .toString());
+	}
+
+    private Object getDelcEndWithInfo(String delcItem, List<CmsEnterpriseRiskInfoDeclaration> declarations) {
+        return "value-" + delcItem; // mock
+    }
+
+    private String getDelcFileUrl(String delcItem, List<CmsEnterpriseRiskInfoDeclaration> declarations) {
+        return "oss://abc";  // mock
+    }
+}

+ 20 - 2
src/main/java/org/example/mybatisplus/model/auto/CmsEnterpriseRiskQxbInfoBO.java

@@ -1,6 +1,10 @@
 package org.example.mybatisplus.model.auto;
 
+import java.util.Optional;
+
+import org.example.mybatisplus.model.auto.EntRiskQxbEmployeesInfo.ItemsInner;
 import org.example.mybatisplus.module.BasicInfo;
+import org.example.mybatisplus.module.vo.SuperiorAuthority;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -73,8 +77,22 @@ public class CmsEnterpriseRiskQxbInfoBO {
     public BasicInfo fillBasicInfoVO (BasicInfo info) {
         info.setInstitutionName(baseInfo.getName());
         info.setEstablishmentDate(baseInfo.getCheckDate());
-        info.setEvaluationLevel(creditGradeInfo.getCreditNo());
-        // todo: ...
+        info.setRegistrationExpiryDate(String.format("%s至%s", baseInfo.getTermStart(), baseInfo.getTermEnd()));
+        info.setPublicActivityScope(baseInfo.getScope());
+        info.setNetAsset(baseInfo.getActualCapi());
+        info.setLegalRepresentative(baseInfo.getOperName());
+        Optional<ItemsInner> optionalSecretory = employeesInfo.getItems()
+            .stream().filter(item -> item.getTitle().equals("秘书长")).findFirst();
+        info.setSecretaryGeneral(optionalSecretory.isPresent() ? optionalSecretory.get().getName() : "-");
+        Optional<ItemsInner> optionalchairman = employeesInfo.getItems()
+            .stream().filter(item -> item.getTitle().equals("理事长")).findFirst();
+        info.setChairman(optionalchairman.isPresent() ? optionalchairman.get().getName() : "-");
+        info.setNumberOfDirectors(employeesInfo.getItems()
+            .stream().filter(item -> item.getTitle().contains("理事")).count());
+        info.setFoundationLocation(baseInfo.getAddress());
+        info.setSuperiorAuthority(new SuperiorAuthority(baseInfo.getBelongOrg(), "-"));
+        info.setRenzcode(baseInfo.getRegNo());
+        info.setValidate(String.format("%s至%s", baseInfo.getTermStart(), baseInfo.getTermEnd()));
         return info;
     }
 }

+ 39 - 0
src/main/java/org/example/mybatisplus/model/auto/CommonLogicFineRuleModel.java

@@ -0,0 +1,39 @@
+package org.example.mybatisplus.model.auto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+import cn.hutool.core.lang.Pair;
+import lombok.NoArgsConstructor;
+
+/**
+ * 精细化评分规则项,可json序列化
+ *
+ */
+@Data
+@NoArgsConstructor
+public class CommonLogicFineRuleModel implements Serializable {
+    private static final long serialVersionUID = -6389402890130074848L;
+
+    /**
+     * 精细化评分规则项子项
+     */
+    private CommonLogicRuleItem[] ruleItems;
+
+    public Pair<Boolean, Long> calculate(String val, CommonLogicModel cm) {
+        for(CommonLogicRuleItem item: ruleItems) {
+            Pair<Boolean, Long> result = item.calculate(val, cm);
+            if(result.getKey()) {
+                if (result.getValue() <= 0) {
+                    // 0分暂处理为false
+                    return new Pair<Boolean, Long>(false, 0L);
+                }
+                return result;
+            }
+        }
+        // score 没有意义
+        return new Pair<Boolean, Long>(false, 0L);
+    }
+}
+

+ 94 - 0
src/main/java/org/example/mybatisplus/model/auto/CommonLogicModel.java

@@ -0,0 +1,94 @@
+package org.example.mybatisplus.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Map;
+
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 通用逻辑模型
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2024/04/13 13:13
+ */
+@Data
+@NoArgsConstructor
+public class CommonLogicModel implements Serializable {
+    private static final long serialVersionUID = -6389402890130074848L;
+
+    /**
+     * 规则字段类型
+     */
+    private CommonType.LogicType logic;
+
+    /**
+     * 指标值
+     */
+    private String targetValue;
+
+    public static CommonLogicModel of(CommonType.LogicType logic, String targetValue) {
+        return new CommonLogicModel(logic, targetValue);
+    }
+
+    public static CommonLogicModel of(Map<String, Object> params) {
+        return new CommonLogicModel(Enum.valueOf(CommonType.LogicType.class, params.get("logic").toString()),
+            params.get("targetValue").toString());
+    }
+
+    protected CommonLogicModel(CommonType.LogicType logic, String targetValue) {
+        this.logic = logic;
+        this.targetValue = targetValue;
+    }
+
+    @SuppressWarnings({"checkstyle:MethodName", "checkstyle:ReturnCount"})
+    protected boolean calculate_internal(String value) {
+        switch (logic) {
+            case CONTAIN:
+                final String[] keywords = targetValue.split(StrUtil.COMMA);
+                return StrUtil.containsAny(value, keywords);
+            case NOT_CONTAIN:
+                final String[] notKeywords = targetValue.split(StrUtil.COMMA);
+                return !StrUtil.containsAny(value, notKeywords);
+            case EQ_ANY:
+                final String[] eqKeys = targetValue.split(StrUtil.COMMA);
+                return StrUtil.equalsAny(value, eqKeys);
+            case GT:
+                BigDecimal val4 = new BigDecimal(value);
+                BigDecimal target4 = new BigDecimal(targetValue);
+                return val4.compareTo(target4) > 0;
+            case GE:
+                BigDecimal val = new BigDecimal(value);
+                BigDecimal target = new BigDecimal(targetValue);
+                return val.compareTo(target) >= 0;
+            case NE:
+                return !targetValue.equals(value);
+            case EQ:
+                if (NumberUtil.isNumber(value)) {
+                    return new BigDecimal(value).compareTo(new BigDecimal(targetValue)) == 0;
+                }
+                return targetValue.equals(value);
+            case LT:
+                BigDecimal val1 = new BigDecimal(value);
+                BigDecimal target1 = new BigDecimal(targetValue);
+                return val1.compareTo(target1) < 0;
+            case LE:
+                BigDecimal val5 = new BigDecimal(value);
+                BigDecimal target5 = new BigDecimal(targetValue);
+                return val5.compareTo(target5) <= 0;
+            case BETWEEN:
+                final String[] btVals = targetValue.split(StrUtil.COMMA);
+                BigDecimal start = new BigDecimal(btVals[0]);
+                BigDecimal end = new BigDecimal(btVals[1]);
+                BigDecimal val3 = new BigDecimal(value);
+                return val3.compareTo(start) >= 0 && val3.compareTo(end) <= 0;
+            default:
+                return false;
+        }
+    }
+}

+ 47 - 0
src/main/java/org/example/mybatisplus/model/auto/CommonLogicRuleItem.java

@@ -0,0 +1,47 @@
+package org.example.mybatisplus.model.auto;
+
+import cn.hutool.core.lang.Pair;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 精细化评分规则项子项,可json序列化
+ *
+ * @author snows
+ * @date 2025/01/17
+ */
+@Data
+public class CommonLogicRuleItem implements Serializable {
+    private static final long serialVersionUID = -320800240067075225L;
+
+    /**
+     * 规则字段类型
+     */
+    private CommonType.RuleType ruleType;
+
+    /**
+     * 规则值,比如:"keyword1,keyword2" 或者 200
+     */
+    private String rule;
+
+    /**
+     * 指标值
+     */
+    private long targetScore;
+
+    /**
+     * 判断逻辑类型
+     */
+    private CommonType.LogicType logicType;
+
+    /**
+     * 计算
+     *
+     * @param val 值
+     * @return {@link Pair }<{@link Boolean }, {@link Integer }> 计算结果
+     */
+    public Pair<Boolean, Long> calculate(String val, CommonLogicModel cm) {
+        return new Pair<>(CommonLogicModel.of(logicType, rule).calculate_internal(val), targetScore);
+    }
+}

+ 360 - 0
src/main/java/org/example/mybatisplus/model/auto/CommonType.java

@@ -0,0 +1,360 @@
+package org.example.mybatisplus.model.auto;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * 通用枚举
+ *
+ * @author jimmy
+ * @version 1.0.1
+ * @date 2022-10-29 18:37
+ */
+@NoArgsConstructor(access = AccessLevel.NONE)
+public final class CommonType {
+
+    /**
+     * 数据权限类型
+     *
+     * @author jimmy
+     * @version 1.0.0
+     * @date 2022-12-02 18:40
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum DataScopeType {
+
+        ALL("ALL", 0, "全部"),
+        CUSTOM("CUSTOM", 1, "自定义"),
+        SET_AND_SUBSET("SET_AND_SUBSET", 2, "本级及子级"),
+        SET("SET", 3, "本级"),
+        SELF("SELF", 4, "本人");
+
+        @EnumValue
+        private final String type;
+        private final Integer code;
+        private final String description;
+    }
+
+
+    // 营地内容类型
+    @Getter
+    @AllArgsConstructor
+    public enum ContentType {
+
+        TEXT("TEXT", "文本"),
+        IMAGE("IMAGE", "图片");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // 联系方式类型
+    @Getter
+    @AllArgsConstructor
+    public enum ContactType {
+
+        TELEPHONE("TEL", "电话"),
+        WE_CHAT("WE_CHAT", "微信");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // 端类型
+    @Getter
+    @AllArgsConstructor
+    public enum TerminalType {
+
+        // WEB
+        MEM_WEB_PLT("MEM_WEB_PLT", UserType.TO_C, "会员WEB平台"),
+        SYS_WEB_PLT("SYS_WEB_PLT", UserType.TO_B, "管理员WEB平台"),
+
+        // 小程序
+        MEM_WECHAT_MP("MEM_WECHAT_MP", UserType.TO_C, "会员微信小程序"),
+        SYS_WECHAT_MP("SYS_WECHAT_MP", UserType.TO_B, "管理员微信小程序");
+        /**
+         * 类型
+         */
+        @EnumValue
+        private final String type;
+
+        private final CommonType.UserType userType;
+
+        /**
+         * 描述
+         */
+        private final String description;
+
+    }
+
+    // 登录类型枚举
+    @Getter
+    @AllArgsConstructor
+    public enum LoginType {
+
+        PWD("PWD", "账号密码登录"),
+        SMS("SMS", "验证码登录"),
+        WE_CHAT("WE_CHAT", "微信小程序"),
+        DING_TALK("DING_TALK", "钉钉"),
+        WE_COM("WE_COM", "企业微信"),
+        EMAIL("email", "邮箱"),
+        CAS("CAS", "CAS 登录");
+
+        /**
+         * 类型
+         */
+        @EnumValue
+        private final String type;
+
+        /**
+         * 描述
+         */
+        private final String description;
+
+    }
+
+    // 性别枚举
+    @Getter
+    @AllArgsConstructor
+    public enum Gender {
+
+        FEMALE("FEMALE", "女"),
+        MALE("MALE", "男"),
+        PRIVACY("PRIVACY", "保密");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+        /**
+         * 根据描述获取性别
+         *
+         * @param description 描述
+         * @return 描述对应的性别,如果描述不存在反悔{@code Gender.PRIVACY}
+         */
+        public static Gender getGenderByDesc(String description) {
+            for (Gender gender : Gender.values()) {
+                if (gender.getDescription().equals(description)) {
+                    return gender;
+                }
+            }
+            return Gender.PRIVACY;
+        }
+    }
+
+    // 身份信息类型
+    @Getter
+    @AllArgsConstructor
+    public enum IdentityType {
+        ID_CARD("ID_CARD", "身份证"),
+        PASSPORT("PASSWORD", "护照");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    // 网络协议
+    @Getter
+    @AllArgsConstructor
+    public enum Protocol {
+        HTTP("http", "http"),
+        HTTPS("https", "https");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+        public static Protocol of(String type) {
+            for (Protocol p : Protocol.values()) {
+                if (p.getType().equalsIgnoreCase(type)) {
+                    return p;
+                }
+            }
+            return null;
+        }
+
+    }
+
+    // 格式类型
+    @Getter
+    @AllArgsConstructor
+    public enum FormatType {
+        PLAIN("PLAIN", "无格式"),
+        JSON("JSON", "JSON"),
+        XML("XML", "XML");
+
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    // http 请求方式
+    @Getter
+    @AllArgsConstructor
+    public enum HttpMethod {
+
+        GET("GET", "GET"),
+        POST("POST", "POST"),
+        DELETE("DELETE", "DELETE"),
+        PUT("PUT", "PUT");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // FromData 类型
+    @Getter
+    @AllArgsConstructor
+    public enum FromDataType {
+
+        TEXT("TEXT", "TEXT"),
+        FILE("FILE", "FILE"),
+        ARRAY("ARRAY", "ARRAY");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // 执照 类型
+    @Getter
+    @AllArgsConstructor
+    public enum LicenseType {
+
+        BIZ_LICENSE("BIZ_LIC", "企业营执"),
+        IND_ID("IND_ID", "个人身份证");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // 2b or 2c
+    @Getter
+    @AllArgsConstructor
+    public enum UserType {
+
+        TO_B("TO_B", "面向客户"),
+        TO_C("TO_C", "面向用户");
+
+        /**
+         * 类型
+         */
+        @EnumValue
+        private final String type;
+
+        /**
+         * 描述
+         */
+        private final String description;
+
+    }
+
+    // 操作人角色
+    @Getter
+    @AllArgsConstructor
+    public enum PlayerType {
+
+        PLATFORM("PLT", "代理平台"),
+        ENTERPRISE("ENT", "企业"),
+        AGENT("AGENT", "代理商"),
+        VENDOR("VENDOR", "商家");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+
+    }
+
+    // 删除类型
+    @Getter
+    @AllArgsConstructor
+    public enum DeleteType {
+        SOFT("SOFT", "软删除"),
+        HARD("HARD", "硬删除");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+
+    // 内容项类型
+    @Getter
+    @AllArgsConstructor
+    public enum ContentItemType {
+        TEXT("TEXT", "文字"),
+        IMAGE("IMAGE", "图片");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    // 内容项类型
+    @Getter
+    @AllArgsConstructor
+    public enum OrderByType {
+        ASC("ASC", "正序"),
+        DESC("DESC", "倒序");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    // 内容项类型
+    @Getter
+    @AllArgsConstructor
+    public enum LogicType {
+
+        BETWEEN("BETWEEN", "之间"),
+        NOT_CONTAIN("NOT_CONTAIN", "不包含"),
+        CONTAIN("CONTAIN", "包含"),
+        EQ_ANY("EQ_ANY", "任意等于"),
+        EQ("EQ", "等于"),
+        NE("NE", "不等于"),
+        GT("GT", "大于"),
+        GE("GE", "大于等于"),
+        LT("LT", "小于"),
+        LE("LE", "小于等于");
+
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    /**
+     * 规则字段类型
+     *
+     * @author snows
+     * @date 2025/01/17
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum RuleType {
+
+        NUMBERIC("NUMBERIC", "数字"),
+        STRING_ARRAY("STRING_ARRAY", "多个匹配文本");
+
+        @EnumValue
+        private final String ruleType;
+        private final String description;
+
+    }
+}

+ 48 - 0
src/main/java/org/example/mybatisplus/model/auto/EasierCommonEntity.java

@@ -0,0 +1,48 @@
+package org.example.mybatisplus.model.auto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 通用实体用来记录操作历史, 由管理员或者用户操作的实体从此继承
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 12/13/23 21:29
+ */
+@Data
+@NoArgsConstructor(access = AccessLevel.NONE)
+public abstract class EasierCommonEntity implements Serializable {
+
+    private static final long serialVersionUID = 7344139240780431717L;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    protected String createdBy;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected String modifiedBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    protected LocalDateTime createdTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected LocalDateTime modifiedTime;
+}

+ 8 - 4
src/main/java/org/example/mybatisplus/module/BasicInfo.java

@@ -3,6 +3,7 @@ package org.example.mybatisplus.module;
 import lombok.Data;
 import org.example.mybatisplus.module.vo.BasicInfoScore;
 import org.example.mybatisplus.module.vo.Attachment;
+import org.example.mybatisplus.module.vo.BasicInfoCheck;
 import org.example.mybatisplus.module.vo.SuperiorAuthority;
 
 import java.util.List;
@@ -35,15 +36,18 @@ public class BasicInfo {
     private String legalRepresentative;         // 法定代表人
     private String secretaryGeneral;            // 秘书长
     private String chairman;                    // 理事长
-    private Integer numberOfDirectors;          // 理事人数
+    private Long numberOfDirectors;          // 理事人数
+
+    // 审查内容
+    private List<BasicInfoCheck> basicInfoChecks;
 
     // 机构详情
     private String foundationLocation;          // 基金会所在地
     private Integer fullTimeStaffCount;         // 全职员工数量
-    private Boolean needOutsourcingService;     // 是否通常需要外包服务
-    private List<String> projectServiceVendors; // 项目服务执行方名单
+    private String needOutsourcingService;     // 是否通常需要外包服务
+    private String projectServiceVendors; // 项目服务执行方名单
 
-    private List<SuperiorAuthority> superiorAuthorities; // 直属上级机关(2.2)
+    private SuperiorAuthority superiorAuthority; // 直属上级机关(2.2)
     private Attachment relatedEntitiesImage;            // ${image:实体关联情况}(2.3)
 
     private String authorityName;  // ${tableRow:直属机关}

+ 13 - 0
src/main/java/org/example/mybatisplus/module/vo/BasicInfoCheck.java

@@ -0,0 +1,13 @@
+package org.example.mybatisplus.module.vo;
+
+import lombok.Data;
+
+// 基本信息风险提示
+@Data
+public class BasicInfoCheck {
+    private String name;      //
+    private String desc;      //
+    private String fact;     // 
+    private String result;      //
+    private Long score;      // 
+}

+ 3 - 3
src/main/java/org/example/mybatisplus/module/vo/BasicInfoScore.java

@@ -5,7 +5,7 @@ import lombok.Data;
 // 基本信息评分及建议子类
 @Data
 public class BasicInfoScore {
-    private Double totalScore;      // ${基本信息评分及建议:基本信息总分}
-    private String riskSummary;     // ${基本信息评分及建议:风险综述}
-    private String suggestion;      // ${基本信息评分及建议:建议}
+    private final Long totalScore;      // ${基本信息评分及建议:基本信息总分}
+    private final String riskSummary;     // ${基本信息评分及建议:风险综述}
+    private final String suggestion;      // ${基本信息评分及建议:建议}
 }

+ 2 - 2
src/main/java/org/example/mybatisplus/module/vo/SuperiorAuthority.java

@@ -8,6 +8,6 @@ import lombok.Data;
 @Data
 public class SuperiorAuthority {
     //直属机关
-    private String sname;
-    private String xingzhi;
+    private final String sname;
+    private final String xingzhi;
 }

+ 0 - 79
src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoCktItemService.java

@@ -1,79 +0,0 @@
-package org.example.mybatisplus.service;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCktItem;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * 企业风险检查项Service接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:27
-*/
-public interface ICmsEntRiskInfoCktItemService extends IService<CmsEntRiskInfoCktItem>{
-																																																																												
-	/**
-	 * 查询企业风险检查项
-	 *
-	 * @param id
-	 * @return CmsEntRiskInfoCktItem
-	 */
-	public CmsEntRiskInfoCktItem selectCmsEntRiskInfoCktItemById(Long id);
-
-	/**
-	 * 查询企业风险检查项列表
-	 *
-	 * @param queryWrapper
-	 * @return CmsEntRiskInfoCktItem集合
-	 */
-	public List<CmsEntRiskInfoCktItem> selectCmsEntRiskInfoCktItemList(Wrapper<CmsEntRiskInfoCktItem> queryWrapper);
-
-	/**
-	 * 查询企业风险检查项列表
-	 *
-	 * @param cmsEntRiskInfoCktItem
-	 * @return CmsEntRiskInfoCktItem集合
-	 */
-	public List<CmsEntRiskInfoCktItem> selectCmsEntRiskInfoCktItemList(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem);
-
-	/**
-	 * 新增企业风险检查项
-	 *
-	 * @param cmsEntRiskInfoCktItem
-	 * @return 结果
-	 */
-	public int insertCmsEntRiskInfoCktItem(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem);
-
-	/**
-	 * 修改企业风险检查项
-	 *
-	 * @param cmsEntRiskInfoCktItem
-	 * @return 结果
-	 */
-	public int updateCmsEntRiskInfoCktItem(CmsEntRiskInfoCktItem  cmsEntRiskInfoCktItem);
-
-	/**
-	 * 批量删除企业风险检查项
-	 *
-	 * @param ids 需要删除的数据ID
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoCktItemByIds(String ids);
-
-	/**
-	 * 删除企业风险检查项信息
-	 *
-	 * @param id
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoCktItemById(Long id);
-
-	/**
-	 * 修改权限状态展示或者不展示
-	 * @param cmsEntRiskInfoCktItem
-	 * @return
-	 */
-	public int updateVisible(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem);
-}

+ 0 - 79
src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoCktService.java

@@ -1,79 +0,0 @@
-package org.example.mybatisplus.service;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCkt;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * 企业风险信息校验Service接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:35
-*/
-public interface ICmsEntRiskInfoCktService extends IService<CmsEntRiskInfoCkt>{
-																																																							
-	/**
-	 * 查询企业风险信息校验
-	 *
-	 * @param id
-	 * @return CmsEntRiskInfoCkt
-	 */
-	public CmsEntRiskInfoCkt selectCmsEntRiskInfoCktById(Long id);
-
-	/**
-	 * 查询企业风险信息校验列表
-	 *
-	 * @param queryWrapper
-	 * @return CmsEntRiskInfoCkt集合
-	 */
-	public List<CmsEntRiskInfoCkt> selectCmsEntRiskInfoCktList(Wrapper<CmsEntRiskInfoCkt> queryWrapper);
-
-	/**
-	 * 查询企业风险信息校验列表
-	 *
-	 * @param cmsEntRiskInfoCkt
-	 * @return CmsEntRiskInfoCkt集合
-	 */
-	public List<CmsEntRiskInfoCkt> selectCmsEntRiskInfoCktList(CmsEntRiskInfoCkt cmsEntRiskInfoCkt);
-
-	/**
-	 * 新增企业风险信息校验
-	 *
-	 * @param cmsEntRiskInfoCkt
-	 * @return 结果
-	 */
-	public int insertCmsEntRiskInfoCkt(CmsEntRiskInfoCkt cmsEntRiskInfoCkt);
-
-	/**
-	 * 修改企业风险信息校验
-	 *
-	 * @param cmsEntRiskInfoCkt
-	 * @return 结果
-	 */
-	public int updateCmsEntRiskInfoCkt(CmsEntRiskInfoCkt  cmsEntRiskInfoCkt);
-
-	/**
-	 * 批量删除企业风险信息校验
-	 *
-	 * @param ids 需要删除的数据ID
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoCktByIds(String ids);
-
-	/**
-	 * 删除企业风险信息校验信息
-	 *
-	 * @param id
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoCktById(Long id);
-
-	/**
-	 * 修改权限状态展示或者不展示
-	 * @param cmsEntRiskInfoCkt
-	 * @return
-	 */
-	public int updateVisible(CmsEntRiskInfoCkt cmsEntRiskInfoCkt);
-}

+ 0 - 79
src/main/java/org/example/mybatisplus/service/ICmsEntRiskInfoDeclService.java

@@ -1,79 +0,0 @@
-package org.example.mybatisplus.service;
-
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoDecl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * 企业风险信息申报Service接口
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:37
-*/
-public interface ICmsEntRiskInfoDeclService extends IService<CmsEntRiskInfoDecl>{
-																																																																												
-	/**
-	 * 查询企业风险信息申报
-	 *
-	 * @param id
-	 * @return CmsEntRiskInfoDecl
-	 */
-	public CmsEntRiskInfoDecl selectCmsEntRiskInfoDeclById(Long id);
-
-	/**
-	 * 查询企业风险信息申报列表
-	 *
-	 * @param queryWrapper
-	 * @return CmsEntRiskInfoDecl集合
-	 */
-	public List<CmsEntRiskInfoDecl> selectCmsEntRiskInfoDeclList(Wrapper<CmsEntRiskInfoDecl> queryWrapper);
-
-	/**
-	 * 查询企业风险信息申报列表
-	 *
-	 * @param cmsEntRiskInfoDecl
-	 * @return CmsEntRiskInfoDecl集合
-	 */
-	public List<CmsEntRiskInfoDecl> selectCmsEntRiskInfoDeclList(CmsEntRiskInfoDecl cmsEntRiskInfoDecl);
-
-	/**
-	 * 新增企业风险信息申报
-	 *
-	 * @param cmsEntRiskInfoDecl
-	 * @return 结果
-	 */
-	public int insertCmsEntRiskInfoDecl(CmsEntRiskInfoDecl cmsEntRiskInfoDecl);
-
-	/**
-	 * 修改企业风险信息申报
-	 *
-	 * @param cmsEntRiskInfoDecl
-	 * @return 结果
-	 */
-	public int updateCmsEntRiskInfoDecl(CmsEntRiskInfoDecl  cmsEntRiskInfoDecl);
-
-	/**
-	 * 批量删除企业风险信息申报
-	 *
-	 * @param ids 需要删除的数据ID
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoDeclByIds(String ids);
-
-	/**
-	 * 删除企业风险信息申报信息
-	 *
-	 * @param id
-	 * @return 结果
-	 */
-	public int deleteCmsEntRiskInfoDeclById(Long id);
-
-	/**
-	 * 修改权限状态展示或者不展示
-	 * @param cmsEntRiskInfoDecl
-	 * @return
-	 */
-	public int updateVisible(CmsEntRiskInfoDecl cmsEntRiskInfoDecl);
-}

+ 0 - 124
src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoCktItemServiceImpl.java

@@ -1,124 +0,0 @@
-package org.example.mybatisplus.service.impl;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.example.mybatisplus.service.ICmsEntRiskInfoCktItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.example.mybatisplus.tools.ConvertUtil;
-import org.example.mybatisplus.mapper.auto.CmsEntRiskInfoCktItemMapper;
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCktItem;
-import cn.hutool.core.bean.BeanUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 企业风险检查项Service业务层处理
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:27
- */
-@Service
-public class CmsEntRiskInfoCktItemServiceImpl extends ServiceImpl<CmsEntRiskInfoCktItemMapper, CmsEntRiskInfoCktItem> implements ICmsEntRiskInfoCktItemService {
-
-    private static final Logger logger = LoggerFactory.getLogger(CmsEntRiskInfoCktItemServiceImpl.class);
-
-    @Autowired
-    private CmsEntRiskInfoCktItemMapper cmsEntRiskInfoCktItemMapper;
-                                                                                                                                                                                                                                                                                                                    /**
-     * 查询企业风险检查项
-     *
-     * @param id
-     * @return CmsEntRiskInfoCktItem
-     */
-    @Override
-    public CmsEntRiskInfoCktItem selectCmsEntRiskInfoCktItemById(Long id) {
-        return this.baseMapper.selectById(id);
-    }
-
-    /**
-     * 查询企业风险检查项列表
-     *
-     * @param queryWrapper
-     * @return CmsEntRiskInfoCktItem集合
-     */
-    @Override
-    public List<CmsEntRiskInfoCktItem> selectCmsEntRiskInfoCktItemList(Wrapper<CmsEntRiskInfoCktItem> queryWrapper) {
-        return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 查询企业风险检查项列表
-     *
-     * @param cmsEntRiskInfoCktItem
-     * @return CmsEntRiskInfoCktItem集合
-     */
-    @Override
-    public List<CmsEntRiskInfoCktItem> selectCmsEntRiskInfoCktItemList(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem) {
-		Map<String, Object> map = BeanUtil.beanToMap(cmsEntRiskInfoCktItem, true, true);
-		QueryWrapper<CmsEntRiskInfoCktItem> queryWrapper = new QueryWrapper<CmsEntRiskInfoCktItem>();
-		queryWrapper.allEq(map,false);
-		return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 新增企业风险检查项
-     *
-     * @param cmsEntRiskInfoCktItem
-     * @return 结果
-     */
-    @Override
-    public int insertCmsEntRiskInfoCktItem(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem) {
-        return this.baseMapper.insert(cmsEntRiskInfoCktItem);
-    }
-
-    /**
-     * 修改企业风险检查项
-     *
-     * @param cmsEntRiskInfoCktItem
-     * @return 结果
-     */
-    @Override
-    public int updateCmsEntRiskInfoCktItem (CmsEntRiskInfoCktItem  cmsEntRiskInfoCktItem) {
-        return this.baseMapper.updateById(cmsEntRiskInfoCktItem);
-    }
-
-    /**
-     * 批量删除企业风险检查项
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoCktItemByIds(String ids) {
-        return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
-    }
-
-    /**
-     * 删除企业风险检查项信息
-     *
-     * @param id
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoCktItemById(Long id) {
-        return this.baseMapper.deleteById(id);
-    }
-
-    /**
-     * 修改权限状态展示或者不展示
-     *
-     * @param cmsEntRiskInfoCktItem
-     * @return
-     */
-    @Override
-    public int updateVisible(CmsEntRiskInfoCktItem cmsEntRiskInfoCktItem) {
-        return this.baseMapper.updateById(cmsEntRiskInfoCktItem);
-    }
-}

+ 0 - 124
src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoCktServiceImpl.java

@@ -1,124 +0,0 @@
-package org.example.mybatisplus.service.impl;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.example.mybatisplus.service.ICmsEntRiskInfoCktService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.example.mybatisplus.tools.ConvertUtil;
-import org.example.mybatisplus.mapper.auto.CmsEntRiskInfoCktMapper;
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoCkt;
-import cn.hutool.core.bean.BeanUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 企业风险信息校验Service业务层处理
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:35
- */
-@Service
-public class CmsEntRiskInfoCktServiceImpl extends ServiceImpl<CmsEntRiskInfoCktMapper, CmsEntRiskInfoCkt> implements ICmsEntRiskInfoCktService {
-
-    private static final Logger logger = LoggerFactory.getLogger(CmsEntRiskInfoCktServiceImpl.class);
-
-    @Autowired
-    private CmsEntRiskInfoCktMapper cmsEntRiskInfoCktMapper;
-                                                                                                                                                                                                                                /**
-     * 查询企业风险信息校验
-     *
-     * @param id
-     * @return CmsEntRiskInfoCkt
-     */
-    @Override
-    public CmsEntRiskInfoCkt selectCmsEntRiskInfoCktById(Long id) {
-        return this.baseMapper.selectById(id);
-    }
-
-    /**
-     * 查询企业风险信息校验列表
-     *
-     * @param queryWrapper
-     * @return CmsEntRiskInfoCkt集合
-     */
-    @Override
-    public List<CmsEntRiskInfoCkt> selectCmsEntRiskInfoCktList(Wrapper<CmsEntRiskInfoCkt> queryWrapper) {
-        return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 查询企业风险信息校验列表
-     *
-     * @param cmsEntRiskInfoCkt
-     * @return CmsEntRiskInfoCkt集合
-     */
-    @Override
-    public List<CmsEntRiskInfoCkt> selectCmsEntRiskInfoCktList(CmsEntRiskInfoCkt cmsEntRiskInfoCkt) {
-		Map<String, Object> map = BeanUtil.beanToMap(cmsEntRiskInfoCkt, true, true);
-		QueryWrapper<CmsEntRiskInfoCkt> queryWrapper = new QueryWrapper<CmsEntRiskInfoCkt>();
-		queryWrapper.allEq(map,false);
-		return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 新增企业风险信息校验
-     *
-     * @param cmsEntRiskInfoCkt
-     * @return 结果
-     */
-    @Override
-    public int insertCmsEntRiskInfoCkt(CmsEntRiskInfoCkt cmsEntRiskInfoCkt) {
-        return this.baseMapper.insert(cmsEntRiskInfoCkt);
-    }
-
-    /**
-     * 修改企业风险信息校验
-     *
-     * @param cmsEntRiskInfoCkt
-     * @return 结果
-     */
-    @Override
-    public int updateCmsEntRiskInfoCkt (CmsEntRiskInfoCkt  cmsEntRiskInfoCkt) {
-        return this.baseMapper.updateById(cmsEntRiskInfoCkt);
-    }
-
-    /**
-     * 批量删除企业风险信息校验
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoCktByIds(String ids) {
-        return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
-    }
-
-    /**
-     * 删除企业风险信息校验信息
-     *
-     * @param id
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoCktById(Long id) {
-        return this.baseMapper.deleteById(id);
-    }
-
-    /**
-     * 修改权限状态展示或者不展示
-     *
-     * @param cmsEntRiskInfoCkt
-     * @return
-     */
-    @Override
-    public int updateVisible(CmsEntRiskInfoCkt cmsEntRiskInfoCkt) {
-        return this.baseMapper.updateById(cmsEntRiskInfoCkt);
-    }
-}

+ 0 - 124
src/main/java/org/example/mybatisplus/service/impl/CmsEntRiskInfoDeclServiceImpl.java

@@ -1,124 +0,0 @@
-package org.example.mybatisplus.service.impl;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.example.mybatisplus.service.ICmsEntRiskInfoDeclService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.example.mybatisplus.tools.ConvertUtil;
-import org.example.mybatisplus.mapper.auto.CmsEntRiskInfoDeclMapper;
-import org.example.mybatisplus.model.auto.CmsEntRiskInfoDecl;
-import cn.hutool.core.bean.BeanUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 企业风险信息申报Service业务层处理
- *
- * @author 各类开发联系微信:qiubbstop     fuce
- * @date 2025-03-09 23:36:37
- */
-@Service
-public class CmsEntRiskInfoDeclServiceImpl extends ServiceImpl<CmsEntRiskInfoDeclMapper, CmsEntRiskInfoDecl> implements ICmsEntRiskInfoDeclService {
-
-    private static final Logger logger = LoggerFactory.getLogger(CmsEntRiskInfoDeclServiceImpl.class);
-
-    @Autowired
-    private CmsEntRiskInfoDeclMapper cmsEntRiskInfoDeclMapper;
-                                                                                                                                                                                                                                                                                                                    /**
-     * 查询企业风险信息申报
-     *
-     * @param id
-     * @return CmsEntRiskInfoDecl
-     */
-    @Override
-    public CmsEntRiskInfoDecl selectCmsEntRiskInfoDeclById(Long id) {
-        return this.baseMapper.selectById(id);
-    }
-
-    /**
-     * 查询企业风险信息申报列表
-     *
-     * @param queryWrapper
-     * @return CmsEntRiskInfoDecl集合
-     */
-    @Override
-    public List<CmsEntRiskInfoDecl> selectCmsEntRiskInfoDeclList(Wrapper<CmsEntRiskInfoDecl> queryWrapper) {
-        return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 查询企业风险信息申报列表
-     *
-     * @param cmsEntRiskInfoDecl
-     * @return CmsEntRiskInfoDecl集合
-     */
-    @Override
-    public List<CmsEntRiskInfoDecl> selectCmsEntRiskInfoDeclList(CmsEntRiskInfoDecl cmsEntRiskInfoDecl) {
-		Map<String, Object> map = BeanUtil.beanToMap(cmsEntRiskInfoDecl, true, true);
-		QueryWrapper<CmsEntRiskInfoDecl> queryWrapper = new QueryWrapper<CmsEntRiskInfoDecl>();
-		queryWrapper.allEq(map,false);
-		return this.baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * 新增企业风险信息申报
-     *
-     * @param cmsEntRiskInfoDecl
-     * @return 结果
-     */
-    @Override
-    public int insertCmsEntRiskInfoDecl(CmsEntRiskInfoDecl cmsEntRiskInfoDecl) {
-        return this.baseMapper.insert(cmsEntRiskInfoDecl);
-    }
-
-    /**
-     * 修改企业风险信息申报
-     *
-     * @param cmsEntRiskInfoDecl
-     * @return 结果
-     */
-    @Override
-    public int updateCmsEntRiskInfoDecl (CmsEntRiskInfoDecl  cmsEntRiskInfoDecl) {
-        return this.baseMapper.updateById(cmsEntRiskInfoDecl);
-    }
-
-    /**
-     * 批量删除企业风险信息申报
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoDeclByIds(String ids) {
-        return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
-    }
-
-    /**
-     * 删除企业风险信息申报信息
-     *
-     * @param id
-     * @return 结果
-     */
-    @Override
-    public int deleteCmsEntRiskInfoDeclById(Long id) {
-        return this.baseMapper.deleteById(id);
-    }
-
-    /**
-     * 修改权限状态展示或者不展示
-     *
-     * @param cmsEntRiskInfoDecl
-     * @return
-     */
-    @Override
-    public int updateVisible(CmsEntRiskInfoDecl cmsEntRiskInfoDecl) {
-        return this.baseMapper.updateById(cmsEntRiskInfoDecl);
-    }
-}