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-11-06 09:36:02 +08:00
commit 58a4606a0d
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
View File

@ -76,5 +76,5 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
FlowRecord selectFlowRecordByRecordIdMinIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("id") Long id, @Param("status") int status);
int batchUpdateExecution(@Param("recordIds")List<Long> recordIds,@Param("processId") Long processId);
int batchUpdateExecution(@Param("recordIds")List<Long> recordIds,@Param("processId") int processId);
}

4
src/main/java/com/lz/modules/performance/controller/FlowChartController.java
View File

@ -157,10 +157,14 @@ public class FlowChartController {
flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId());
flowChartDetailRecord.setStepIndex(index);
if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次
flowChartDetailRecord.setStepType(0);
}
flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus());
if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){
updaes.add(flowChartDetailRecord);
}else{
inserts.add(flowChartDetailRecord);
}
if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){

2
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -90,7 +90,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
@Autowired
private DingtalkBusiness dingtalkBusiness;
public static final Long processId = 1L;
public static final int processId = 1;

1
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -269,6 +269,7 @@
,gmt_modified = now()
where is_delete = 0 and status !=4 and flow_process = 2 and process_id = #{processId}
<if test="recordIds !=null and recordIds.size()!=0">
and record_id in (
<foreach collection="recordIds" item="record_id" separator=",">
#{record_id}
</foreach>