diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index adbd32ff..9e096d9e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -104,4 +104,7 @@ public class FieldCommon { // 标准类别代号(数据库对应字段) public static final String STANDARD_CATEGORY_CODE = "category_code"; + // 稽查内容 + public static final String CHECK_LIST = "checkList"; + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 1cb2b4bd..ffa16f61 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.common.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,6 +18,8 @@ import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; @@ -94,6 +97,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private ILawsReplacedStandardService lawsReplacedStandardService; @Autowired private ILawsStandardFileService lawsStandardFileService; + + @Resource + private EnterpriseStandardInspectContentService esInspectContentService; @Resource private EnterpriseStandardUtil esUtil; @@ -445,6 +451,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 企标需要自动拼装标准号 if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { + // 生成企标编号 String standardNumber = esUtil.generateStandardNumber(parameterMap); parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); } @@ -513,9 +520,38 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对标准体系做处理 lawsNodeRelationService.addRelation(standardSystem, standardNumber, id); + // 执行企标独有的逻辑 + if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { + this.enterpriseStandardAdd(parameterMap, id, standardNumber); + } + + return MessageUtils.getMessage(ResultCommon.OK); } + public void enterpriseStandardAdd(Map parameterMap, String standardId, String standardNo) { + // 保存新增企标时的稽查内容 + // 转换稽查内容 + List checkList = (List) parameterMap.get(FieldCommon.CHECK_LIST); + List inspectContents = this.convertList(checkList); + // 设置标准Id和标准编号 + for (EnterpriseStandardInspectContent inspectContent : inspectContents) { + inspectContent.setStandardId(standardId); + inspectContent.setStandardNo(standardNo); + } + esInspectContentService.saveBatch(inspectContents); + + } + private List convertList(List originalList) { + List resultList = new ArrayList<>(); + for (LinkedHashMap map : originalList) { + String jsonString = JSON.toJSONString(map); + EnterpriseStandardInspectContent content = JSON.parseObject(jsonString, EnterpriseStandardInspectContent.class); + resultList.add(content); + } + return resultList; + } + /** * @Author: liao * @Date: 2023/8/24 14:12 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java index 9cebd0b1..52314a53 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.entity; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -58,15 +59,26 @@ public class EnterpriseStandardInspectContent implements Serializable { @ApiModelProperty(value = "所属部门") private String orgCode; + /** 企标编号 */ + @ApiModelProperty(value = "企标Id") + private String standardId; + /** 企标编号 */ @ApiModelProperty(value = "企标编号") private String standardNo; /** 章节条款id */ @ApiModelProperty(value = "章节条款id") - private String chapterId; + private String clauseId; + + /** 条款 */ + @JSONField(name = "subjectToClause") + @ApiModelProperty(value = "条款") + private String clause; + + /** 标准内容或要求 */ + @JSONField(name = "standardContentOrRequirements") + @ApiModelProperty(value = "标准内容或要求") + private String requirement; - /** 整改部门 */ - @ApiModelProperty(value = "整改部门") - private String adjDept; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectContentMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectContentMapper.xml index 7e5ffacb..b602b558 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectContentMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectContentMapper.xml @@ -11,14 +11,11 @@ + - - + + + - - id,create_by,create_time, - update_by,update_time,org_code, - standard_no,chapter_id,adj_dept -