wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-29 09:59:57 +08:00
parent 7e5452428c
commit de8fa66bb3
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -398,12 +398,12 @@ public class ResultRecordController extends AbstractController {
} }
if(batchOpt == 3 ){ if(batchOpt == 3 ){
for (ResultRecord resultRecord : resultRecords) { for (ResultRecord resultRecord : resultRecords) {
r = resultRecordService.reject(resultRecord,1); //更新驳回状态 r = resultRecordService.approval(resultRecord.getId(), resultRecord.getCurrentApprovalStaffId(),null,false);
if (!r.isSuccess()) { if (!r.isSuccess()) {
return r; return r;
} }
} }
} else { } else if(batchOpt == 4 ){
for (ResultRecord resultRecord : resultRecords) { for (ResultRecord resultRecord : resultRecords) {
List<FlowRecord> list = flowRecordService.selectFlowRecordByResultRecordIdType(resultRecord.getId(), 2); List<FlowRecord> list = flowRecordService.selectFlowRecordByResultRecordIdType(resultRecord.getId(), 2);
for (int i = list.size() - 1; i >= 0; i--) { for (int i = list.size() - 1; i >= 0; i--) {

9
src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
View File

@ -4,14 +4,16 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.common.utils.BigDecimalUtil; import com.lz.common.utils.BigDecimalUtil;
import com.lz.common.utils.Constant; import com.lz.common.utils.Constant;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.resp.ResultDetailResp;
import com.lz.modules.app.resp.Step; import com.lz.modules.app.resp.Step;
import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsService;
import com.lz.modules.app.service.StaffService; import com.lz.modules.app.service.StaffService;
import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.app.utils.t.TwoTuple;
import com.lz.modules.flow.entity.*; import com.lz.modules.flow.entity.Flow;
import com.lz.modules.flow.entity.FlowDepartment;
import com.lz.modules.flow.entity.FlowRecord;
import com.lz.modules.flow.entity.FlowRelation;
import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.model.Auth;
import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.model.StaffRoleDto;
import com.lz.modules.flow.service.*; import com.lz.modules.flow.service.*;
@ -257,14 +259,13 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
StaffEntity flowStaff = staffService.selectStaffById(flowDepartment.getStaffId()); StaffEntity flowStaff = staffService.selectStaffById(flowDepartment.getStaffId());
roleNameMap.put(departmentLevel,flowStaff.getName()); roleNameMap.put(departmentLevel,flowStaff.getName());
}else{ }else{
Long roleId = flows.get(flowIndex - 1).getRoleId(); Long roleId = flows.size() > flowIndex - 1 ? flows.get(flowIndex - 1).getRoleId() : null;
List<StaffRoleDto> staffRoleDtos = new ArrayList<>(); List<StaffRoleDto> staffRoleDtos = new ArrayList<>();
StaffEntity approvalStaff = resultRecordService.getApprovalStaff(resultRecord, departmentLevel, staffRoleDtos, roleId); StaffEntity approvalStaff = resultRecordService.getApprovalStaff(resultRecord, departmentLevel, staffRoleDtos, roleId);
roleNameMap.put(departmentLevel,approvalStaff.getName()); roleNameMap.put(departmentLevel,approvalStaff.getName());
} }
} }
} }
log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) + " roleNameMap : " + JSON.toJSONString(roleNameMap)); log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) + " roleNameMap : " + JSON.toJSONString(roleNameMap));
for (int i = flowIndex; i < flowIndex + 10; i++) { for (int i = flowIndex; i < flowIndex + 10; i++) {
int index = resultRecordService.getDepartmentLevelIndex(flows, i); int index = resultRecordService.getDepartmentLevelIndex(flows, i);

1
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -526,7 +526,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
.put("type", WorkMsgTypeEnum.SUBMIT); .put("type", WorkMsgTypeEnum.SUBMIT);
} }
@Override @Override
public StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel,List<StaffRoleDto> staffRoleDtos, Long roleId) { public StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel,List<StaffRoleDto> staffRoleDtos, Long roleId) {
StaffEntity approvalStaff = null; StaffEntity approvalStaff = null;

2
src/main/resources/mapper/app/ResultDetailMapper.xml
View File

@ -97,7 +97,7 @@
<if test="priority != null">priority = #{priority}</if> <if test="priority != null">priority = #{priority}</if>
</trim> </trim>
,gmt_modified = now() ,gmt_modified = now()
where id = #{id} where id = #{id} limit 1
</update> </update>