QR/laws_chery_serve
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:
梁琦涛
2024-08-30 17:07:28 +08:00
parent 0f8a43147b 79c599aa40
commit 6a42ff5c04
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+2 -2
View File
@@ -144,7 +144,7 @@
ORDER BY create_time DESC
</select>
<select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
SELECT id, standard_number, standard_name, null as release_date, implementation_date, standard_state
SELECT id, standard_number, standard_name, null as release_date, implementation_date, standard_state, create_by, create_time, update_by, update_time
FROM laws_domestic_standard
WHERE del_flag = 0
<if test="standardNumber != null and standardNumber != ''">
@@ -156,7 +156,7 @@
UNION ALL
SELECT id, standard_number, standard_name, release_date, implementation_date, standard_state
SELECT id, standard_number, standard_name, release_date, implementation_date, standard_state, create_by, create_time, update_by, update_time
FROM laws_enterprise_standard
WHERE del_flag = 0
<if test="standardNumber != null and standardNumber != ''">
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+24
View File
@@ -1380,10 +1380,34 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
// 标准拆分标识
splitFlag(stringObjectMap);
// 添加固定字段
this.setFixedUserInfo(stringObjectMap, singleStandard);
// 对返回的字段做处理
return stringObjectMap;
}
private void setFixedUserInfo(Map<String, Object> stringObjectMap, ManyStandardSelectionBox singleStandard) {
List<String> userNames = new ArrayList<>();
userNames.add(singleStandard.getCreateBy());
userNames.add(singleStandard.getUpdateBy());
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.in(SysUser::getUsername, userNames);
if (!CollectionUtils.isEmpty(sysUserService.list(sysUserLambdaQueryWrapper))) {
for (SysUser sysUser : sysUserService.list(sysUserLambdaQueryWrapper)) {
if (sysUser.getUsername().equals(singleStandard.getCreateBy())) {
stringObjectMap.put("createBy_dictText", sysUser.getRealname() + "(" + sysUser.getUsername() + ")");
}
if (sysUser.getUsername().equals(singleStandard.getUpdateBy())) {
stringObjectMap.put("updateBy_dictText", sysUser.getRealname() + "(" + sysUser.getUsername() + ")");
}
}
}
stringObjectMap.put("createBy", singleStandard.getCreateBy());
stringObjectMap.put("createTime", singleStandard.getCreateTime());
stringObjectMap.put("updateBy", singleStandard.getUpdateBy());
stringObjectMap.put("updateTime", singleStandard.getUpdateTime());
}
/**
* @Author: liao
* @Date: 2023/8/24 13:52
laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
+10
View File
@@ -60,8 +60,18 @@ public class ManyStandardSelectionBox {
private Date createTime;
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
@ApiModelProperty(value = "创建人 翻译")
private java.lang.String createBy_dictText;
@ApiModelProperty(value = "更新人 翻译")
private java.lang.String updateBy_dictText;
@ApiModelProperty(value = "责任人")
@Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id")
private java.lang.String responsibleUser;