内部审核细节划分
This commit is contained in:
liang.chao
parent
fa8410f12a
commit
2dcc9c5eb6
|
|
@ -157,4 +157,7 @@ public class LeaseApplyInfo implements Serializable {
|
|||
@ApiModelProperty(value="审批状态id")
|
||||
private String examineStatusId;
|
||||
|
||||
@ApiModelProperty(value="审核状态")
|
||||
private String status;
|
||||
|
||||
}
|
||||
|
|
@ -21,9 +21,9 @@ public interface TmTaskService{
|
|||
|
||||
List<TmTask> getLeaseAuditListForApp(TmTask record);
|
||||
|
||||
/** 领料任务审核状态修改 */
|
||||
/** 领料任务审核通过状态修改 */
|
||||
int updateLeaseTaskAuditInfo(TmTask record);
|
||||
|
||||
/** 领料任务审核驳回状态修改 */
|
||||
int updateLeaseTaskRejectInfo(TmTask record);
|
||||
|
||||
String genderLeaseCode();
|
||||
|
|
|
|||
|
|
@ -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<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
|
||||
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
|
||||
if (leaseApplyInfo != null) {
|
||||
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
|
||||
//获取当前用户所属公司id
|
||||
Long companyId = sysUser.getCompanyId();
|
||||
//获取当前用户的角色
|
||||
Set<String> 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> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo);
|
||||
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
|
||||
|
|
|
|||
|
|
@ -616,6 +616,30 @@
|
|||
update_by = #{record.companyAuditBy},
|
||||
update_time = now(),
|
||||
</if>
|
||||
<if test="record.examineStatusId == 103 and record.examineStatusId == '103'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 1,
|
||||
</if>
|
||||
<if test="record.examineStatusId == 105 and record.examineStatusId == '105'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 3,
|
||||
</if>
|
||||
<if test="record.examineStatusId == 107 and record.examineStatusId == '107'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 5,
|
||||
</if>
|
||||
<if test="record.examineStatusId == 109 and record.examineStatusId == '109'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 7,
|
||||
</if>
|
||||
</trim>
|
||||
WHERE
|
||||
task_id = #{record.taskId}
|
||||
|
|
@ -641,6 +665,30 @@
|
|||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
</if>
|
||||
<if test="record.examineStatusId == 104 and record.examineStatusId == '104'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 2,
|
||||
</if>
|
||||
<if test="record.examineStatusId == 106 and record.examineStatusId == '106'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 4,
|
||||
</if>
|
||||
<if test="record.examineStatusId == 108 and record.examineStatusId == '108'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 6
|
||||
</if>
|
||||
<if test="record.examineStatusId == 110 and record.examineStatusId == '110'">
|
||||
direct_audit_by = #{record.companyAuditBy},
|
||||
direct_audit_time = now(),
|
||||
direct_audit_remark = #{record.companyAuditRemark},
|
||||
status = 8,
|
||||
</if>
|
||||
</trim>
|
||||
WHERE
|
||||
task_id = #{record.taskId}
|
||||
|
|
|
|||
Loading…
Reference in New Issue