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-12-03 11:11:40 +08:00
parent 436b1446e8
commit eb3ada58d3
5 changed files with 257 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1152,7 +1152,6 @@ public class ResultRecordController extends AbstractController {
}
/**
*
* 删除
*/
// http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=593&loginUserId=322
@ -1166,4 +1165,16 @@ public class ResultRecordController extends AbstractController {
}
// http://localhost:8080/lz_management/user/lzresultrecord/get/reset/data?resultRecordId=593&loginUserId=322
@RequestMapping("/get/reset/data")
public R getResetData(RecordDetailDto recordDetailDto) {
if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){
recordDetailDto.setLoginUserId(getUserId());
}
return resultRecordService.getResetData(recordDetailDto);
}
}

7
src/main/java/com/lz/modules/app/controller/TestController.java
View File

@ -9,6 +9,7 @@ import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.dao.DepartmentsDao;
import com.lz.modules.app.dto.ApprovalDto;
import com.lz.modules.app.dto.RecordDetailDto;
import com.lz.modules.app.entity.DepartmentsEntity;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.entity.StaffEntity;
@ -298,4 +299,10 @@ public class TestController {
System.out.println(roleIds);
}
//http://localhost:8080/lz_management/test/reset/data?resultRecordId=3714
@RequestMapping("/test/reset/data")
public R getResetData(RecordDetailDto recordDetailDto) {
return resultRecordService.getResetData(recordDetailDto);
}
}

13
src/main/java/com/lz/modules/app/resp/ResetDataResp.java Normal file
View File

@ -0,0 +1,13 @@
package com.lz.modules.app.resp;
import lombok.Data;
import java.util.List;
@Data
public class ResetDataResp {
private String flowName;
private List<String> staffNames;
private Long id ;
}

2
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -125,4 +125,6 @@ public interface ResultRecordService extends IService<ResultRecord> {
List<ResultRecord> selectResultRecordsByStartId(Long startId);
List<Long> selectResultRecordIdsByStartId(Long startId);
R getResetData(RecordDetailDto recordDetailDto);
}

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

@ -20,10 +20,7 @@ import com.lz.modules.app.enums.FlowApprovalRoleTypeEnums;
import com.lz.modules.app.enums.FlowRecordStatusEnums;
import com.lz.modules.app.enums.RoleEnums;
import com.lz.modules.app.req.ResultRecordReq;
import com.lz.modules.app.resp.FlowDetailResp;
import com.lz.modules.app.resp.FlowRecordResp;
import com.lz.modules.app.resp.OwnResultResp;
import com.lz.modules.app.resp.ResultRecordResp;
import com.lz.modules.app.resp.*;
import com.lz.modules.app.service.DepartmentsService;
import com.lz.modules.app.service.DepartmentsStaffRelateService;
import com.lz.modules.app.service.StaffService;
@ -74,8 +71,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private ResultRecordMapper resultRecordMapper;
private static EmployeesDto employeesDto;
@Autowired
@ -1169,6 +1164,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowRecordList.add(resp);
flowIndex = flowRecord.getFlowIndex();
}
boolean flag = true;
for (FlowRecord flowRecord : flowRecords) {
if (flowRecord.getStatus() == 2) {
@ -1176,6 +1172,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
break;
}
}
FlowRecordResp end = new FlowRecordResp();
end.setFlowName("结束");
end.setStatus(flag ? 1 : 0);
@ -1350,4 +1347,27 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
public List<Long> selectResultRecordIdsByStartId(Long startId) {
return resultRecordMapper.selectIdsByStartId(startId);
}
@Override
public R getResetData(RecordDetailDto recordDetailDto) {
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordId(recordDetailDto.getResultRecordId());
int flowIndex = 0;
List<ResetDataResp> resetDataResps = new ArrayList<>();
for (FlowRecord flowRecord : flowRecords) {
if (flowRecord.getFlowIndex().equals(flowIndex - 1)) { //表示有重复数据
ResetDataResp resetDataResp = resetDataResps.get(flowIndex - 1);
resetDataResp.getStaffNames().add(flowRecord.getApprovalStaffName());
continue;
}
ResetDataResp resetDataResp = new ResetDataResp();
resetDataResp.setFlowName(flowRecord.getFlowName());
resetDataResp.setId(flowRecord.getId());
List<String> staffNames = new ArrayList<>();
staffNames.add(flowRecord.getApprovalStaffName());
resetDataResp.setStaffNames(staffNames);
resetDataResps.add(resetDataResp);
flowIndex ++ ;
}
return R.ok().put("data",resetDataResps);
}
}