jiezhoufg/yc_fdjyfluru
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:
zjh 2025-12-05 15:43:24 +08:00
commit 2185854a4e
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/xdap/self_development/listener/EngineModelListener.java
View File

@ -35,10 +35,6 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
private final String ycOrOt;
private Integer versionNumber = 0;
private Date date = new Date();
private String createdBy = "Excel导入";
private Date createdDate = date;
private String lastModifiedBy = "";
private Date lastModifiedDate = date;
private XdapUsers usersPojo;
@ -137,9 +133,9 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
modelPojo.setVersionNumber(versionNumber);
modelPojo.setIsDelete(0);
modelPojo.setCreatedBy(usersPojo.getId());
modelPojo.setLastUpdatedBy(lastModifiedBy);
modelPojo.setLastUpdateDate(lastModifiedDate);
modelPojo.setCreationDate(createdDate);
modelPojo.setLastUpdatedBy("");
modelPojo.setLastUpdateDate(new Date());
modelPojo.setCreationDate(new Date());
modelPojo.setId(UUID.randomUUID().toString());
modelPojos.add(modelPojo);
// sw.buildFromDatasource("test_demo").doInsert(modelPojo);
@ -171,9 +167,9 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
engineParamDetailPojo.setMajorVersion(versionNumber);
engineParamDetailPojo.setVersionStatus(ParamValueVersionEnum.DRAFT.getCode());
engineParamDetailPojo.setCreatedBy(usersPojo.getId());
engineParamDetailPojo.setLastUpdatedBy(lastModifiedBy);
engineParamDetailPojo.setLastUpdateDate(lastModifiedDate);
engineParamDetailPojo.setCreationDate(createdDate);
engineParamDetailPojo.setLastUpdatedBy("");
engineParamDetailPojo.setLastUpdateDate(new Date());
engineParamDetailPojo.setCreationDate(new Date());
engineParamDetailPojos.add(engineParamDetailPojo);
//为每个参数生成默认责任人
List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());

3
src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
View File

@ -35,9 +35,6 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
private Integer versionNumber = 1;
private Date date = new Date();
private String createdBy = "Excel导入";
private Date createdDate = date;
private String lastModifiedBy = "";
private Date lastModifiedDate = date;
Map<String, String> stringParameterMap;
private RuntimeException importException = null;
private ArrayList<String> successSheetName = null;

4
src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
View File

@ -274,11 +274,11 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
record.setApprovalComment(comment);
sw.buildFromDatasource("xdap_app_223770822127386625").doInsert(record);
if (!"拒绝".equals(operator) && !"同意".equals(operator)) {
if (!"REJECT".equals(operator) && !"PASS".equals(operator)) {
throw new RuntimeException("无法识别的操作");
}
//驳回处理
if ("拒绝".equals(operator)) {
if ("REJECT".equals(operator)) {
//更改参数状态
sw.buildFromDatasource("xdap_app_223770822127386625")
.update("version_status", ParamValueVersionEnum.REFUSE.getCode())//改为已拒绝