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

获取

Browse Source
This commit is contained in:
wulin 2020-10-22 15:06:20 +08:00
parent d6fd83df5d
commit cd93891f21
6 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.lz.modules.flow.entity.ResultTagetLib;
import com.lz.modules.flow.model.ResultTagetLibDto;
import com.lz.modules.flow.req.ResultTagetLibItemReq;
import com.lz.modules.flow.req.ResultTagetLibSearchReq;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -45,4 +46,6 @@ public interface ResultTagetLibMapper extends BaseMapper<ResultTagetLib> {
int insertResultTagetLibs(@Param("list") List<ResultTagetLib> inserts);
int updateResultTagetLibByIds(@Param("list") List<ResultTagetLib> inserts);
List<ResultTagetLibItemReq> selectResultTagetLibByModelReqId(Long id);
}

5
src/main/java/com/lz/modules/performance/controller/FlowStartController.java
View File

@ -132,7 +132,7 @@ public class FlowStartController {
if(evaluationStartStaffs.size() > 0){
evaluationStartStaffService.insertEvaluationStartStaffs(evaluationStartStaffs);
//下面初始化lz_flow流程表 lz_flow_approval_role流程审批表
List<Flow> flows = new ArrayList<>();
//List<Flow> flows = new ArrayList<>();
List<FlowApprovalRole> flowApprovalRoles = new ArrayList<>();
for (FlowChartDetailRecord flowChartDetailRecord:flowChartDetailRecords
) {
@ -174,6 +174,9 @@ public class FlowStartController {
}
//插入记录
}
if(flowApprovalRoles.size() > 0){
}
for (EvaluationStartStaff startStaff:evaluationStartStaffs
) {

24
src/main/java/com/lz/modules/performance/controller/ResultModelController.java
View File

@ -36,24 +36,30 @@ public class ResultModelController {
@GetMapping("/getByGroupId")
@ApiOperation(value="根据考核组id获取模板列表")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDto.class)})
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDetailReq.class)})
public R getByGroupId(@RequestParam @ApiParam("考核组ID") Long id) {
//List<ResultModel> resultModels = resultModelService.selectResultModelByGroupId(id);
return R.ok().put("data",getResultModelDto(id));
}
private List<ResultModelDto> getResultModelDto(Long id){
ResultModelDetailReq resultModelDetailReq = new ResultModelDetailReq();
List<ResultModelItemReq> modelItems = new ArrayList<>();
List<ResultModelDto> resultModelDtos = resultModelService.selectResultDtoByGroupId(id);
for (ResultModelDto dto:resultModelDtos
) {
List<ResultTagetLibDto> libDtos = resultTagetLibService.selectResultTagetLibByModelId(dto.getId());
dto.setTagetLibs(libDtos);
resultModelDetailReq.setCalculateId(dto.getCalculateId());
resultModelDetailReq.setEvaluationGroupId(dto.getEvaluationGroupId());
resultModelDetailReq.setGradeStatus(dto.getGradeStatus());
ResultModelItemReq itemReq = new ResultModelItemReq();
BeanUtils.copyProperties(dto, itemReq);
List<ResultTagetLibItemReq> req = resultTagetLibService.selectResultTagetLibByModelReqId(dto.getId());
itemReq.setTagetLibItems(req);
modelItems.add(itemReq);
}
return resultModelDtos;
resultModelDetailReq.setModelItems(modelItems);
return R.ok().put("data",resultModelDetailReq);
}
@RequestMapping("/getById")
public R getById(@RequestBody ResultModel resultModel) {
resultModel = resultModelService.selectResultModelById(resultModel.getId());

3
src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java
View File

@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R;
import com.lz.modules.flow.entity.ResultTagetLib;
import com.lz.modules.flow.model.ResultTagetLibDto;
import com.lz.modules.flow.req.ResultTagetLibItemReq;
import com.lz.modules.flow.req.ResultTagetLibSearchReq;
import java.util.List;
@ -45,4 +46,6 @@ public interface ResultTagetLibService extends IService<ResultTagetLib> {
int insertResultTagetLibs(List<ResultTagetLib> inserts);
int updateResultTagetLibByIds(List<ResultTagetLib> inserts);
List<ResultTagetLibItemReq> selectResultTagetLibByModelReqId(Long id);
}

6
src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.lz.modules.flow.dao.ResultTagetLibMapper;
import com.lz.modules.flow.entity.ResultModel;
import com.lz.modules.flow.entity.ResultTagetLib;
import com.lz.modules.flow.model.ResultTagetLibDto;
import com.lz.modules.flow.req.ResultTagetLibItemReq;
import com.lz.modules.flow.req.ResultTagetLibSearchReq;
import com.lz.modules.flow.service.ResultModelService;
import com.lz.modules.performance.service.ResultTagetLibService;
@ -119,6 +120,11 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
return resultTagetLibMapper.updateResultTagetLibByIds(inserts);
}
@Override
public List<ResultTagetLibItemReq> selectResultTagetLibByModelReqId(Long id){
return resultTagetLibMapper.selectResultTagetLibByModelReqId(id);
}
}

4
src/main/resources/mapper/flow/ResultTagetLibMapper.xml
View File

@ -143,5 +143,9 @@
</update>
<select id="selectResultTagetLibByModelReqId" resultType="com.lz.modules.flow.req.ResultTagetLibItemReq" >
select id, is_delete, name, weight, key_result from lz_result_taget_lib where model_id=#{id} and is_delete = 0 order by order_by desc
</select>
</mapper>