认证-参数项收集-变更:责任领域bug修改
This commit is contained in:
-3
@@ -1,8 +1,6 @@
|
|||||||
package com.jero.modules.cert.collect.entity;
|
package com.jero.modules.cert.collect.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
@@ -121,7 +119,6 @@ public class ParamsCollectManifestBaseEO implements Serializable {
|
|||||||
/**工程接口人*/
|
/**工程接口人*/
|
||||||
@Excel(name = "工程接口人", width = 15)
|
@Excel(name = "工程接口人", width = 15)
|
||||||
@ApiModelProperty(value = "工程接口人")
|
@ApiModelProperty(value = "工程接口人")
|
||||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
|
||||||
private String sdt;
|
private String sdt;
|
||||||
|
|
||||||
/**填写人*/
|
/**填写人*/
|
||||||
|
|||||||
+8
-4
@@ -382,7 +382,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
|||||||
sdtMap.put("id", collectManifestEO.getId());
|
sdtMap.put("id", collectManifestEO.getId());
|
||||||
sdtMap.put("state", collectManifestEO.getState());
|
sdtMap.put("state", collectManifestEO.getState());
|
||||||
sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
|
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);
|
manifestMap.put("sdt", sdtMap);
|
||||||
|
|
||||||
// 配置列名数组
|
// 配置列名数组
|
||||||
@@ -1227,13 +1231,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
|||||||
if (ObjectUtil.isNotEmpty(sysUser)) {
|
if (ObjectUtil.isNotEmpty(sysUser)) {
|
||||||
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
|
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
|
||||||
} else {
|
} else {
|
||||||
updateEO.setSdt(null); // 设置工程接口人
|
updateEO.setSdt(""); // 设置工程接口人
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
updateEO.setSdt(null); // 设置工程接口人
|
updateEO.setSdt(""); // 设置工程接口人
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
updateEO.setSdt(null); // 设置工程接口人
|
updateEO.setSdt(""); // 设置工程接口人
|
||||||
}
|
}
|
||||||
|
|
||||||
return updateById(updateEO);
|
return updateById(updateEO);
|
||||||
|
|||||||
Reference in New Issue
Block a user