From 9946d69282b7f089459b6336aca2727efef88a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 6 Nov 2020 09:23:23 +0800 Subject: [PATCH 1/4] fix --- src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java | 2 +- .../performance/service/impl/AssessManagerServiceImpl.java | 2 +- src/main/resources/mapper/flow/FlowRecordMapper.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java index 97d0ffd5..a0126aab 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -76,5 +76,5 @@ public interface FlowRecordMapper extends BaseMapper { FlowRecord selectFlowRecordByRecordIdMinIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("id") Long id, @Param("status") int status); - int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") Long processId); + int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") int processId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index ca2e70f7..05d80216 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -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; diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index a5cfd818..a2b699ae 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -269,6 +269,7 @@ ,gmt_modified = now() where is_delete = 0 and status !=4 and flow_process = 2 and process_id = #{processId} + and record_id in ( #{record_id} From 3c8547c3bcc20275de0fca8fbf3c6bc2885a47fa Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 09:35:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 1 + .../sys/service/app/impl/ResultRecordServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 36fedbc9..1fe3d0c6 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -53,6 +53,7 @@ public class ShiroConfig { filterMap.put("/webjars/**", "anon"); filterMap.put("/file/**", "anon"); filterMap.put("/user/lzstaffrole/role/**", "anon"); + filterMap.put("/user/lzresultrecord/**", "anon"); filterMap.put("/test/**", "anon"); filterMap.put("/druid/**", "anon"); filterMap.put("/app/**", "anon"); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 01d5c891..bea5b83b 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -824,6 +824,7 @@ public class ResultRecordServiceImpl extends ServiceImpl currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2); + log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId()); if(currentResultRecords !=null && currentResultRecords.size() > 0 ){ FlowRecord currentResultRecord = null; for(FlowRecord flowRecord:currentResultRecords){ if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){ currentResultRecord = flowRecord; + log.info("当前审批用户 id id :" + currentResultRecord.getApprovalStaffId()); break; } } - if(currentResultRecord !=null){ if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){ Map map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class); From c221ee5ff8dcd56dc51e0f5107b9f99cd9df7503 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 09:58:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/TestController.java | 2 +- .../service/app/impl/ResultRecordServiceImpl.java | 5 ++--- src/main/resources/mapper/flow/FlowRecordMapper.xml | 13 ++++++++----- src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 21ea024a..b1255e5d 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -261,7 +261,7 @@ public class TestController { } } - // http://localhost:8080/lz_management/test/resultrecord?resultRecordId=215 + // http://localhost:8080/lz_management/test/resultrecord?resultRecordId=381 @RequestMapping("/test/resultrecord") public void resultRecorcd(Long resultRecordId) throws Exception{ R r = resultRecordService.initFlowRecord(resultRecordId); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index bea5b83b..cf1a99a0 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -773,7 +773,6 @@ public class ResultRecordServiceImpl extends ServiceImpl flowApprovalRoles =flowApprovalRoleService.selectFlowApprovalRoleList(flowIds); int i = 0; - List flowRecords = new ArrayList<>(); for (FlowApprovalRole flowApprovalRole : flowApprovalRoles) { FlowRecord flowRecord = new FlowRecord(); flowRecord.setRecordId(resultRecord.getId()); @@ -814,9 +813,9 @@ public class ResultRecordServiceImpl extends ServiceImpl + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole, status_name AS statusName, type AS type, process_id AS processId + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole, status_name AS statusName, type AS type, process_id AS processId, flow_process AS flowProcess @@ -52,6 +53,7 @@ status_name, type, process_id, + flow_process, is_delete, gmt_create, gmt_modified @@ -69,6 +71,7 @@ #{ statusName}, #{ type}, #{ processId}, + #{ flowProcess}, 0, now(), now() @@ -94,7 +97,8 @@ flow_staff_id_role = #{flowStaffIdRole}, status_name = #{statusName}, type = #{type}, - process_id = #{processId} + process_id = #{processId}, + flow_process = #{flowProcess} ,gmt_modified = now() where id = #{id} @@ -119,7 +123,8 @@ flow_staff_id_role = #{flowStaffIdRole}, status_name = #{statusName}, type = #{type}, - process_id = #{processId} + process_id = #{processId}, + flow_process = #{flowProcess} ,gmt_modified = now() where id = #{id} @@ -130,8 +135,6 @@ - - diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 014f5562..d8784020 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -126,7 +126,7 @@ public class MysqlMain { List list = new ArrayList(); - list.add(new TablesBean("lz_evaluation_group")); + list.add(new TablesBean("lz_flow_record")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); From a556bbbb6b158cb307b3ac1ea7a53ea3c54160c8 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 11:14:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 34c3de8e..008916e0 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -999,7 +999,7 @@ public class ResultRecordController extends AbstractController { /** * 删除 */ - // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=331&loginUserId=825 + // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=387&loginUserId=380 @RequestMapping("/new/resultRecordDetail") public R newResultRecordList(RecordDetailDto recordDetailDto) { if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){ diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index cf1a99a0..2e6a569b 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1114,8 +1114,8 @@ public class ResultRecordServiceImpl extends ServiceImpl