From 2dcc9c5eb6dca2ef785fab54396ff26d10effe09 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 17 Jan 2024 17:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=AE=A1=E6=A0=B8=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E5=88=92=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/domain/LeaseApplyInfo.java | 3 ++ .../bonus/sgzb/app/service/TmTaskService.java | 4 +- .../app/service/impl/TmTaskServiceImpl.java | 18 ++++++- .../resources/mapper/app/TmTaskMapper.xml | 48 +++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index 4dfd1132..a3a7ac5d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -157,4 +157,7 @@ public class LeaseApplyInfo implements Serializable { @ApiModelProperty(value="审批状态id") private String examineStatusId; + @ApiModelProperty(value="审核状态") + private String status; + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 2b5acc92..ee258e04 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -21,9 +21,9 @@ public interface TmTaskService{ List getLeaseAuditListForApp(TmTask record); - /** 领料任务审核状态修改 */ + /** 领料任务审核通过状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); - + /** 领料任务审核驳回状态修改 */ int updateLeaseTaskRejectInfo(TmTask record); String genderLeaseCode(); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 1264fbe5..e71bf8a5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.system.api.domain.SysUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -19,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Set; /** * Description: @@ -131,7 +133,7 @@ public class TmTaskServiceImpl implements TmTaskService { Integer typeId = leaseApplyDetail.getTypeId(); //根据器具id找到对应的库管员信息 Integer userId = tmTaskMapper.getKgByMaType(typeId); - if (userId != null && userId != 0 && SecurityUtils.getLoginUser().getUserid().equals((long)userId)) { + if (userId != null && userId != 0 && SecurityUtils.getLoginUser().getUserid().equals((long) userId)) { // 统计预领数量 count += leaseApplyDetail.getPreNum(); leaseApplyDetail.setUserId(userId); @@ -338,6 +340,20 @@ public class TmTaskServiceImpl implements TmTaskService { List listLeaseDetails = new ArrayList<>(); for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { + SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); + //获取当前用户所属公司id + Long companyId = sysUser.getCompanyId(); + //获取当前用户的角色 + Set roles = SecurityUtils.getLoginUser().getRoles(); + StringBuilder sb = new StringBuilder(); + for (String s : roles) { + sb.append(s); + } + String rolesStr = sb.toString(); + //如果是内部人员，加上所属公司 + if (rolesStr.contains("nbry") && !rolesStr.contains("admin")) { + leaseApplyInfo.setCompanyId(Integer.parseInt(companyId.toString())); + } // 去查询领料任务详情表 List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fbcd3d9e..e8677f1e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -616,6 +616,30 @@ update_by = #{record.companyAuditBy}, update_time = now(), + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 1, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 3, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 5, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 7, + WHERE task_id = #{record.taskId} @@ -641,6 +665,30 @@ direct_audit_time = now(), direct_audit_remark = #{record.companyAuditRemark}, + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 2, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 4, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 6 + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = 8, + WHERE task_id = #{record.taskId}