WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-18 13:57:04 +08:00
parent f63feeb9d7 b65c73f152
commit 542946b2bd
8 changed files with 408 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
-3
View File
@@ -1,8 +1,6 @@
package com.jero.modules.cert.collect.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -121,7 +119,6 @@ public class ParamsCollectManifestBaseEO implements Serializable {
/**工程接口人*/
@Excel(name = "工程接口人", width = 15)
@ApiModelProperty(value = "工程接口人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String sdt;
/**填写人*/
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+8 -4
View File
@@ -382,7 +382,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
sdtMap.put("id", collectManifestEO.getId());
sdtMap.put("state", collectManifestEO.getState());
sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
sdtMap.put("dataValue", collectManifestEO.getSdt());
if (StringUtils.isNotBlank(collectManifestEO.getSdt())) {
sdtMap.put("dataValue", collectManifestEO.getSdt());
} else {
sdtMap.put("dataValue", null);
}
manifestMap.put("sdt", sdtMap);
// 配置列名数组
@@ -1227,13 +1231,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (ObjectUtil.isNotEmpty(sysUser)) {
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
} else {
updateEO.setSdt(null); // 设置工程接口人
updateEO.setSdt(""); // 设置工程接口人
}
} else {
updateEO.setSdt(null); // 设置工程接口人
updateEO.setSdt(""); // 设置工程接口人
}
} else {
updateEO.setSdt(null); // 设置工程接口人
updateEO.setSdt(""); // 设置工程接口人
}
return updateById(updateEO);