bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

组织架构变更审核 

Signed-off-by: lSun <15893999301@qq.com>
This commit is contained in:
lSun 2024-12-03 20:20:54 +08:00
parent 10055d6178
commit 54c2e23a32
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
View File

@ -121,5 +121,9 @@ public class OrgChangeBean {
*/ */
private String endTime; private String endTime;
/**
* 审核意见
*/
private String checkOpinion;
} }

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
View File

@ -79,9 +79,9 @@ public class OrgChangeServiceImpl implements OrgChangeService {
String userName = sysUser.getUserName(); String userName = sysUser.getUserName();
String orgName = sysUser.getOrgName(); String orgName = sysUser.getOrgName();
if ("1".equals(o.getIsCheck())) { if ("1".equals(o.getIsCheck())) {
o.setRemark("同意 " + orgName + " " + userName + " " + DateUtil.now()); o.setCheckOpinion("同意 " + orgName + " " + userName + " " + DateUtil.now());
} else { } else {
o.setRemark("不同意 " + orgName + " " + userName + " " + DateUtil.now()); o.setCheckOpinion("不同意 " + orgName + " " + userName + " " + DateUtil.now());
} }
o.setCheckTime(DateUtil.date()); o.setCheckTime(DateUtil.date());
} else if (ownStatus.contains(o.getIsCheck())) { } else if (ownStatus.contains(o.getIsCheck())) {

4
bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
View File

@ -86,7 +86,7 @@
<update id="updateOrgChange"> <update id="updateOrgChange">
update org_change set user_id = #{userId}, old_org_id = #{oldOrgId}, new_org_id = #{newOrgId}, update org_change set user_id = #{userId}, old_org_id = #{oldOrgId}, new_org_id = #{newOrgId},
is_change_att_group = #{isChangeAttGroup}, change_effective_date = #{changeEffectiveDate}, is_change_att_group = #{isChangeAttGroup}, change_effective_date = #{changeEffectiveDate},
is_check = #{isCheck} is_check = #{isCheck}, remark = #{remark}
<if test="oldAttGroup != null and oldAttGroup != ''">,old_att_group = #{oldAttGroup}</if> <if test="oldAttGroup != null and oldAttGroup != ''">,old_att_group = #{oldAttGroup}</if>
<if test="newAttGroup != null and newAttGroup != ''">,new_att_group = #{newAttGroup}</if> <if test="newAttGroup != null and newAttGroup != ''">,new_att_group = #{newAttGroup}</if>
where id = #{id} where id = #{id}
@ -95,7 +95,7 @@
update org_change update org_change
<set> <set>
<if test="checkUserId != 0L"> <if test="checkUserId != 0L">
remark = #{remark}, check_opinion = #{checkOpinion},
check_user_id = #{checkUserId}, check_user_id = #{checkUserId},
check_time = #{checkTime}, check_time = #{checkTime},
</if> </if>