diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java index 2d4268d7..eec5abfe 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java @@ -42,6 +42,10 @@ public interface BackApplyAppMapper { List examineView(BackApplyInfo record); int audit(BackApplyInfo record); + int auditByAdmin(BackApplyInfo record); + int updateBackApply(BackApplyInfo record); + + List selectBackApplyInfo(BackApplyInfo record); int refuse(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 027b1431..7caa9913 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -1,20 +1,24 @@ package com.bonus.sgzb.app.service.impl; +import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.BackApplyAppMapper; import com.bonus.sgzb.app.service.BackApplyService; +import com.bonus.sgzb.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** -* @description 退料申请--app -* @author hay -* @date 2024/1/22 11:13 -*/ + * @author hay + * @description 退料申请--app + * @date 2024/1/22 11:13 + */ @Service public class BackApplyServiceImpl implements BackApplyService { @@ -85,7 +89,35 @@ public class BackApplyServiceImpl implements BackApplyService { @Override public int audit(BackApplyInfo record) { - return backApplyMapper.audit(record); + int num = 0; + Set roles = SecurityUtils.getLoginUser().getRoles(); + String username = SecurityUtils.getLoginUser().getUsername(); + record.setCreateBy(username); + if (roles.contains("admin")){ + return backApplyMapper.auditByAdmin(record); + } + if (roles.contains("jjfgs")) { + record.setCompanyId("101"); + record.setStatus("1"); + return backApplyMapper.audit(record); + } + if (roles.contains("tsfgs")) { + record.setCompanyId("102"); + record.setStatus("3"); + return backApplyMapper.audit(record); + } + List backApplyInfos = backApplyMapper.selectBackApplyInfo(record); + if (CollUtil.isNotEmpty(backApplyInfos)) { + for (BackApplyInfo backApplyInfo : backApplyInfos) { + if (backApplyInfo.getStatus().equals("1") || backApplyInfo.getStatus().equals("3")) { + num++; + } + } + } + if (num == backApplyInfos.size()) { + return backApplyMapper.updateBackApply(record); + } + return 0; } @Override diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index b5d3ba78..a96cd618 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -278,11 +278,12 @@ UPDATE tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() + SET bai.status = #{status},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() WHERE - bai.id = #{id} + bai.id = #{id} and bai.company_id = #{companyId} + UPDATE tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id @@ -302,8 +303,24 @@ WHERE bai.id = #{id} + + UPDATE tm_task tt + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + SET tt.task_status = 38 + WHERE + bai.id = #{id} + + + UPDATE tm_task tt + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + SET bai.status = 38,bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() + WHERE + bai.id = #{id} + - + DELETE FROM tm_task_agreement WHERE task_id IN (SELECT task_id FROM back_apply_info WHERE id = #{id}); @@ -488,6 +505,13 @@ WHERE bai.id=#{id} + \ No newline at end of file