ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2023-11-03 11:29:36 +08:00
parent 02e42f4d22 42d774e3a5
commit d3125a9620
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
+2
View File
@@ -318,6 +318,8 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
userTaskNode.setNodeName(userTask.getName()); userTaskNode.setNodeName(userTask.getName());
userTaskNode.setNodeType("userTask"); userTaskNode.setNodeType("userTask");
userTaskNode.setXmlNodeId(userTask.getId()); userTaskNode.setXmlNodeId(userTask.getId());
userTaskNode.setVariableType("string");
userTaskNode.setVariableName(userTask.getId());
userTaskNode.setSort(sort); userTaskNode.setSort(sort);
userTaskNode.setIsApprovalNode(1); userTaskNode.setIsApprovalNode(1);
userTaskNode.setIsCanDeleted(1); userTaskNode.setIsCanDeleted(1);
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class EnterpriseStandardPlanVo {
@ApiModelProperty(value = "原企标编号") @ApiModelProperty(value = "原企标编号")
private String originEnStandardNo; private String originEnStandardNo;
@Excel(name = "新企标编号", width = 15, orderNum = "2") @Excel(name = "新企标编号", width = 15, orderNum = "1")
@ApiModelProperty(value = "新企标编号") @ApiModelProperty(value = "新企标编号")
private String newEnStandardNo; private String newEnStandardNo;
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+2 -2
View File
@@ -179,7 +179,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
if (esDatalist.isEmpty()) { if (esDatalist.isEmpty()) {
log.info("企标数据为空，跳过导入"); log.info("企标数据为空，跳过导入");
} else { } else {
this.oldSysESImport(esDatalist); // this.oldSysESImport(esDatalist);
} }
// 导入国标 // 导入国标
// 判断是否需要跳过 // 判断是否需要跳过
@@ -214,7 +214,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
gb.setReleaseDate(dto.getFbrq()); gb.setReleaseDate(dto.getFbrq());
gb.setImplementationDate(dto.getSsrq()); gb.setImplementationDate(dto.getSsrq());
String standardState = dto.getBzzt(); String standardState = dto.getBzzt();
gb.setStandardState(standardState.equals("现行有效") ? "8" : "9"); gb.setStandardState(standardState.equals("现行有效") ? "6" : "7");
// 代替被代替特殊逻辑 // 代替被代替特殊逻辑
gb.setSubstituteStandardNumber(dto.getTdbzh()); gb.setSubstituteStandardNumber(dto.getTdbzh());
gb.setReplacedByStandardNumber(dto.getBtdbzh()); gb.setReplacedByStandardNumber(dto.getBtdbzh());