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

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
yjz
2024-01-05 17:31:34 +08:00
parent b230d85a3d 4dcc6503ce
commit 48955fb425
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+4 -1
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
@@ -91,13 +92,15 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
}
variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue());
variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
String standardId = IdWorker.getIdStr();
variables.put(FieldCommon.ID, standardId);
// 发布企标
lawsCommonService.commonAdd(variables);
String espId = data.getEspId();
EnterpriseStandardPlan esp = espService.getById(espId);
// 保存评审会记录
EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord();
esRmr.setStandardId(esp.getId());
esRmr.setStandardId(standardId);
esRmr.setPlanId(esp.getId());
esRmr.setReviewDate(data.getReviewDate());
rmrService.save(esRmr);
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+8 -3
View File
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
@@ -653,7 +654,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 新增数据值
StringBuilder valuesBuilder = new StringBuilder();
// 对默认的字段赋值
String id = getCommonInsertValue(fieldsBuilder, valuesBuilder);
String existId = parameterMap.get(FieldCommon.ID) == null ? "" : parameterMap.get(FieldCommon.ID).toString();
String id = getCommonInsertValue(fieldsBuilder, valuesBuilder, existId);
// 拼接要添加的数据
for (Map.Entry<String, Object> entryMap : parameterMap.entrySet()) {
String key = entryMap.getKey();
@@ -1850,9 +1852,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Date: 2023/8/24 9:37
* @Description: 获取新增默认值
**/
private String getCommonInsertValue(StringBuilder fieldsBuilder, StringBuilder valuesBuilder) {
private String getCommonInsertValue(StringBuilder fieldsBuilder, StringBuilder valuesBuilder, String id) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = UUID.randomUUID().toString().replace("-", "");
if (StrUtil.isBlank(id)) {
// 如果id为空，则生成id
id = IdWorker.getIdStr();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String commonInsertValues = "'" + id + "','" + sysUser.getUsername() + "',"
+ FieldCommon.STR_TO_DATE_PREFIX + sdf.format(new Date()) + FieldCommon.STR_TO_DATE_SUFFIX + ",'" + sysUser.getUsername() + "',"