组织架构考勤规则审核意见与备注混淆问题修改

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java

@@ -1,5 +1,6 @@
 package com.bonus.system.att.controller;
 
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
@@ -58,8 +59,10 @@ public class OrgChangeController extends BaseController {
     public TableDataInfo getAllList(OrgChangeBean bean) {
         try{
             startPage();
-            //不查撤回的
-            bean.setIsCheck("-1");
+            if(StringUtils.isEmpty(bean.getIsCheck())){
+                //不查撤回的
+                bean.setIsCheck("-1");
+            }
             return getDataTable(orgChangeService.selectOrgChangeList(bean));
         }catch (Exception e){
             log.error(e.toString(),e);

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

@@ -100,6 +100,11 @@ public class OrgChangeBean {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkTime;
 
+    /**
+     * 审核意见
+     */
+    private String checkOpinion;
+
     /**
      * 备注
      */
@@ -122,4 +127,11 @@ public class OrgChangeBean {
     private String endTime;
 
 
+    /**
+     * 导出使用，审核页面导出还是使用人员页面导出
+     * 1：人员页面导出，2：审核页面导出
+     */
+    private String exportType;
+
+
 }

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

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

bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java

@@ -9,6 +9,7 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.bonus.common.core.constant.BusinessConstants;
 import com.bonus.common.core.enums.AttStatus;
 import com.bonus.common.core.utils.ExcelStyleUtil;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.system.att.entity.*;
@@ -564,6 +565,16 @@ public class ExportFileController {
     public void exportOrgChange(HttpServletResponse response, OrgChangeBean bean) {
         try {
             List<OrgChangeBean> personExportVoList = new ArrayList<>();
+            if("1".equals(bean.getExportType())){
+                //只查自己的
+                Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();
+                bean.setUserId(userId);
+            }else{
+                if(StringUtils.isEmpty(bean.getIsCheck())){
+                    //不查撤回的
+                    bean.setIsCheck("-1");
+                }
+            }
             List<OrgChangeBean> personLists = orgChangeService.selectOrgChangeList(bean);
             for (int i = 0; i < personLists.size(); i++) {
                 OrgChangeBean vo = personLists.get(i);

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

@@ -72,11 +72,11 @@
     </delete>
 
     <insert id="insertOrgChange">
-        insert into org_change(user_id, old_org_id, new_org_id,is_change_att_group, change_effective_date, is_check
+        insert into org_change(user_id, old_org_id, new_org_id,is_change_att_group, change_effective_date, is_check, reamrk
         <if test="oldAttGroup != null and oldAttGroup != ''">,old_att_group</if>
         <if test="newAttGroup != null and newAttGroup != ''">,new_att_group</if>
         )
-        values (#{userId},#{oldOrgId},#{newOrgId},#{isChangeAttGroup},#{changeEffectiveDate},#{isCheck}
+        values (#{userId},#{oldOrgId},#{newOrgId},#{isChangeAttGroup},#{changeEffectiveDate},#{isCheck},#{remark}
         <if test="oldAttGroup != null and oldAttGroup != ''">,#{oldAttGroup}</if>
         <if test="newAttGroup != null and newAttGroup != ''">,#{newAttGroup}</if>
         )
@@ -86,7 +86,7 @@
     <update id="updateOrgChange">
         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_check = #{isCheck}
+                              is_check = #{isCheck},remark = #{remark}
         <if test="oldAttGroup != null and oldAttGroup != ''">,old_att_group = #{oldAttGroup}</if>
         <if test="newAttGroup != null and newAttGroup != ''">,new_att_group = #{newAttGroup}</if>
         where id = #{id}
@@ -95,7 +95,7 @@
         update org_change
         <set>
             <if test="checkUserId != 0L">
-                remark = #{remark},
+                check_opinion = #{checkOpinion},
                 check_user_id = #{checkUserId},
                 check_time = #{checkTime},
             </if>