From b031dba1ee57407336e2d61e0eb5a59303846aed Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 22 Sep 2020 15:56:56 +0800 Subject: [PATCH 01/10] =?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/common/emun/WorkMsgTypeEnum.java | 1 + .../controller/ResultRecordController.java | 72 ++++++++++++++----- .../flow/service/RecordAuthService.java | 2 + .../service/impl/RecordAuthServiceImpl.java | 15 ++++ .../sys/dao/app/ResultRecordMapper.java | 2 +- .../modules/sys/entity/app/ResultRecord.java | 2 +- .../sys/service/app/ResultRecordService.java | 6 +- .../app/impl/ResultRecordServiceImpl.java | 63 +++++++++------- .../mapper/app/ResultRecordMapper.xml | 12 +++- 9 files changed, 124 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java index f0c82d48..0ae139aa 100644 --- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java +++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java @@ -15,6 +15,7 @@ public enum WorkMsgTypeEnum { //绩效通过人事，老板审核的最终审核通知 PASS(3, "绩效通过", "去查看", "# 绩效通过\n ## 你的绩效已经通过"), URGING(4, "绩效催办", "去审批", "# 绩效催办\n ## @提醒您审批"), + END(5, "绩效终止", "去查看", "# 绩效终止\n ## @，你的绩效终止"), ; int type; String title; 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 bbc7ccfb..5058cc95 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.PrintWriter; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -133,7 +132,6 @@ public class ResultRecordController extends AbstractController { } } } - R r = lzResultRecordService.queryPage(req, user); r .put("departmentList1", departmentList1) .put("departmentList2", departmentList2) @@ -359,7 +357,7 @@ public class ResultRecordController extends AbstractController { @RequestMapping("/recordIdsSubmit") public R recordIdsSubmit(String recordIds,Integer batchOpt) { if (StringUtil.isBlank(recordIds)) { - return R.error("请选择提交"); + return R.error("请勾选需要批量操作业绩！"); } List records = new ArrayList<>(); String ids[] = recordIds.split(","); @@ -370,29 +368,69 @@ public class ResultRecordController extends AbstractController { } } } - if (records == null) { - return R.error("请选择状态为待提交的记录"); - } R r = null; - if(batchOpt == 1){ - List resultRecords = resultRecordService.selectResultRecordByIds(records); + List resultRecords = resultRecordService.selectResultRecordByIds(records); + if(batchOpt == 1){ //提交审批 for (ResultRecord resultRecord : resultRecords) { - if (!resultRecord.getStatus().equals(3)) { - return R.error("您的提交记录中有状态不为侍提交的，请重新选择。"); + if (!StringUtil.in(resultRecord.getStatus(),1,2,3,5)) { + return R.error("您的提交记录中有状态不正确，请重新选择"); } } for (ResultRecord resultRecord : resultRecords) { - r = resultRecordService.approval(resultRecord.getId(), getUserId(),null); + r = resultRecordService.approval(resultRecord.getId(), resultRecord.getCurrentApprovalStaffId(),null,false); if (!r.isSuccess()) { return r; } } - }else if(batchOpt ==2 ){ - - }else if (batchOpt == 3 ){ - - }else if (batchOpt == 4 ){ - + } else if (batchOpt == 2) { //终止流程 + for (ResultRecord resultRecord : resultRecords) { + if (!StringUtil.in(resultRecord.getStatus(),1,2,3,5,6)) { + return R.error("您的提交记录中有状态不正确，请重新选择"); + } + } + for (ResultRecord resultRecord : resultRecords) { + r = resultRecordService.approval(resultRecord.getId(), resultRecord.getCurrentApprovalStaffId(), 7, true); + if (!r.isSuccess()) { + return r; + } + } + } else if (batchOpt == 3 || batchOpt == 4 ) { // 3 申述无效,直接驳回 ,4 领导重新打分 + for (ResultRecord resultRecord : resultRecords) { + if (!StringUtil.in(resultRecord.getStatus(),6)) { + return R.error("您的提交记录中有状态不正确，请重新选择"); + } + resultRecordService.reject(resultRecord); + } + if(batchOpt == 3 ){ + for (ResultRecord resultRecord : resultRecords) { + r = resultRecordService.reject(resultRecord); + if (!r.isSuccess()) { + return r; + } + } + } else { + for (ResultRecord resultRecord : resultRecords) { + List list = flowRecordService.selectFlowRecordByResultRecordIdType(resultRecord.getId(), 2); + for (int i = list.size() - 1; i >= 0; i--) { + FlowRecord flowRecord = list.get(i); + Long roleId = recordAuthService.getRoleIdByStaffRoleInfo(flowRecord.getFlowStaffIdRole(), flowRecord.getApprovalStaffId()); + List listAuth = recordAuthService.selectAuthInfo(roleId); + Auth auth = recordAuthService.getAuth(listAuth); + if (auth.getEditScore() > 0) {//表示是评分 + resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole()); + resultRecord.setCurrentApprovalStaffId(flowRecord.getApprovalStaffId()); + resultRecord.setCurrentApprovalStaffName(flowRecord.getApprovalStaffName()); + resultRecord.setStatus(1); + // 直接还原权限 + resultRecordService.updateResultRecordById(resultRecord); + break; + } else { + flowRecord.setStatus(1);//如果不是领导打分的话，直接删除掉 + flowRecordService.updateFlowRecordById(flowRecord); + } + } + } + } } if (r != null && r.isSuccess()) {//批量提交 StaffEntity mySelf = (StaffEntity) r.get("from"); diff --git a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java index d25b64f4..7898bced 100644 --- a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java +++ b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java @@ -43,4 +43,6 @@ public interface RecordAuthService extends IService { String selectByStaffId(Long staffId); List selectAll(); + + Long getRoleIdByStaffRoleInfo(String flowStaffIdRole,Long approvalStaffId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index e9c6b390..6e9e7d11 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -103,6 +103,21 @@ public class RecordAuthServiceImpl extends ServiceImpl list = JSONObject.parseArray(flowStaffIdRole, StaffRoleDto.class); + if (CollectionUtils.isNotEmpty(list)) { + for(StaffRoleDto staffRoleDto:list){ + if(staffRoleDto.getStaffId().equals(approvalStaffId)){ + return staffRoleDto.getRoleId(); + } + } + } + } + return 0l; + } + public Auth getAuth(List auths) { Map map = new HashMap<>(); diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index 9d949b52..f623fd50 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -49,7 +49,7 @@ public interface ResultRecordMapper extends BaseMapper { List selectByConditionByLeader(@Param("page") IPage page, @Param("req") ResultRecordReq params); - void updateFlowStaffIdRoleToNull(@Param("id") Long id); + void updateFlowStaffIdRoleToNull(@Param("id") Long id, @Param("status") Integer status); List selectResultRecordByIds(@Param("recordIds") List recordIds); diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java b/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java index acc4c94c..d1e966dd 100644 --- a/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java +++ b/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java @@ -28,7 +28,7 @@ public class ResultRecord implements java.io.Serializable { private Date gmtModified; //月份 private Date monthTime; - //0.新建，1 提交审批中，2 拒绝, 3 侍提交 ，4 审批通过,5 驳回 + //0.新建，1 提交审批中，2 拒绝, 3 侍提交 ，4 审批通过,5 驳回，6申述，7 流程终止 private Integer status; //最后得分 private BigDecimal lastScore; diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index c48a39b5..d9d41e0f 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -51,9 +51,9 @@ public interface ResultRecordService extends IService { ResultRecord selectResultRecordByStaffId(Long userId); - void updateFlowStaffIdRoleToNull(Long id); + void updateFlowStaffIdRoleToNull(Long id,Integer status); - R approval(Long resultRecordId, Long userId,Integer status); + R approval(Long resultRecordId, Long userId,Integer status,boolean flagEnd); List selectResultRecordByIds(List recordIds); @@ -92,5 +92,5 @@ public interface ResultRecordService extends IService { ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status); - R reject( ResultRecord resultRecord,ResultRecordReq req, Long userId); + R reject( ResultRecord resultRecord); } \ No newline at end of file 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 d9c6f442..078545ca 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 @@ -187,9 +187,6 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByConditionByLeader(page, params) ); @@ -272,8 +276,8 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoleMap = recordAuthService.selectRoleIdByStaffRoleInfo(resultRecord.getFlowStaffIdRole()); List listAuth = recordAuthService.selectAuthInfo(staffRoleMap.get(userId)); Auth auth = recordAuthService.getAuth(listAuth); @@ -398,13 +403,12 @@ public class ResultRecordServiceImpl extends ServiceImpl> flowInfo = getFlowInfo(resultRecord.getStaffId(), resultRecord.getType()); Long flowId = flowInfo.getFirst(); @@ -429,17 +433,23 @@ public class ResultRecordServiceImpl extends ServiceImpl= approvalList.size()) { //表示流程己经结束 + if (index < 0 || index >= approvalList.size() || flagEnd) { //表示流程己经结束 lastFlowRecord.setFlowName(mySelf.getName() + "-审批通过"); lastFlowRecord.setStatusName(FlowRecordEnum.END.getName()); flowRecordService.updateCoverFlowRecordById(lastFlowRecord); - resultRecordService.updateFlowStaffIdRoleToNull(resultRecord.getId());// 更新用户权限 - return R.ok("流程审批结束") - .put("from", staff) - .put("to", staff) - .put("type", WorkMsgTypeEnum.PASS); + resultRecordService.updateFlowStaffIdRoleToNull(resultRecord.getId(), status != null ? status : 4);// 更新状态 + if (flagEnd) { + return R.ok("流程终止") + .put("from", staff) + .put("to", staff) + .put("type", WorkMsgTypeEnum.END); + } else { + return R.ok("流程审批结束") + .put("from", staff) + .put("to", staff) + .put("type", WorkMsgTypeEnum.PASS); + } } - FlowRecord flowRecord = new FlowRecord(); flowRecord.setRecordId(resultRecordId); flowRecord.setRecordStaffId(resultRecord.getStaffId()); @@ -569,17 +579,17 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByResultRecordIdType(req.getRecordResultId(),resultRecord.getType()); - if(flowRecords!=null && flowRecords.size() == 2){ // 表示可以撤回 - r = reject(resultRecord, req, userId); + r = reject(resultRecord); + } else if (req.getStatus() == 7) { + List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdType(req.getRecordResultId(), resultRecord.getType()); + if (flowRecords != null && flowRecords.size() == 2) { // 表示可以撤回 + r = reject(resultRecord); } else if (flowRecords != null && flowRecords.size() > 2) { return R.error("你的领导己经审批，不能撤回了"); } @@ -594,7 +604,7 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(req.getRecordResultId()); + public R reject( ResultRecord resultRecord){ + List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(resultRecord.getId()); StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId()); StaffEntity approvalStaff = mySelf; if (flowRecords.size() >= 2) { FlowRecord secondFlowRecord = flowRecords.get(flowRecords.size() - 2); resultRecord.setFlowStaffIdRole(secondFlowRecord.getFlowStaffIdRole()); - resultRecord.setStatus(req.getStatus()); + resultRecord.setStatus(5); //更新驳回状态为5 List list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class); if (CollectionUtils.isNotEmpty(list)) { StaffRoleDto staffRoleDto = list.get(0); @@ -627,17 +637,18 @@ public class ResultRecordServiceImpl extends ServiceImpl + and department_level = #{req.departmentLevel} + + AND DATE_FORMAT(rd.month_time, '%Y-%m-%d %H:%i:%S') = ]]> DATE_FORMAT(#{req.monthBeginDate}, '%Y-%m-%d %H:%i:%S') @@ -199,9 +203,11 @@ AND DATE_FORMAT(rd.month_time, '%Y-%m-%d %H:%i:%S') DATE_FORMAT(#{req.monthEndDate}, '%Y-%m-%d %H:%i:%S') + and rd.status = #{req.status} + AND rd.remark LIKE CONCAT('%',#{req.remark},'%') @@ -225,7 +231,7 @@ and rd.staff_id = #{req.staffId} - + and rd.current_approval_staff_id = #{req.approvalStaffId} order by fr.id desc ) @@ -243,7 +249,7 @@ - update lz_result_record set flow_staff_id_role = '[]',status = 4,current_approval_staff_id = null ,current_approval_staff_name = null where id = #{id} + update lz_result_record set flow_staff_id_role = '[]',status = #{status},current_approval_staff_id = null ,current_approval_staff_name = null where id = #{id} + select * from lz_flow_manager where id=#{id} and is_delete = 0 limit 1 + + + + + insert into lz_flow_manager( + name, + is_delete, + gmt_create, + gmt_modified + )values( + #{ name}, + 0, + now(), + now() + ) + + + + + update + lz_flow_manager + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_flow_manager + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_flow_manager set is_delete = 1 where id=#{id} limit 1 + + + + + + + + diff --git a/src/main/resources/sql b/src/main/resources/sql index 644852f2..7021cb32 100644 --- a/src/main/resources/sql +++ b/src/main/resources/sql @@ -43,3 +43,21 @@ INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `or + +-- 菜单SQL +INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) + VALUES ('55', '流程管理表', 'user/lzflowmanager', NULL, '1', 'config', '6'); + +-- 按钮父菜单ID +set @parentId = @@identity; + + +-- 菜单对应按钮SQL +INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) + SELECT @parentId, '查看', null, 'user:lzflowmanager:list,user:lzflowmanager:info', '2', null, '6'; +INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) + SELECT @parentId, '新增', null, 'user:lzflowmanager:save', '2', null, '6'; +INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) + SELECT @parentId, '修改', null, 'user:lzflowmanager:update', '2', null, '6'; +INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) + SELECT @parentId, '删除', null, 'user:lzflowmanager:delete', '2', null, '6'; diff --git a/src/test/java/com/lz/flt/Create.java b/src/test/java/com/lz/flt/Create.java index 19447d79..a19e7a74 100644 --- a/src/test/java/com/lz/flt/Create.java +++ b/src/test/java/com/lz/flt/Create.java @@ -51,7 +51,7 @@ public class Create { } public static void main(String[] args) { Create ot=new Create(); - String [] tableNames = {"lz_record_role"}; + String [] tableNames = {"lz_flow_manager"}; try { ot.generatorCode(tableNames); } catch (Exception e) { diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 479cac29..f3d4a298 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -63,7 +63,7 @@ public class MysqlMain { } List list = new ArrayList(); - list.add(new TablesBean("lz_flow_record")); + list.add(new TablesBean("lz_flow_manager")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); From b4dc5b821094fa060868b7df22ec3934e6382394 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 23 Sep 2020 10:58:48 +0800 Subject: [PATCH 05/10] =?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 --- .../app/controller/FlowManagerController.java | 7 + .../com/lz/modules/flow/model/FlowDto.java | 30 ++++ .../com/lz/modules/flow/model/FlowInfo.java | 14 ++ .../flow/service/FlowManagerService.java | 3 + .../service/impl/FlowManagerServiceImpl.java | 130 ++++++++++++++++++ 5 files changed, 184 insertions(+) create mode 100644 src/main/java/com/lz/modules/flow/model/FlowDto.java create mode 100644 src/main/java/com/lz/modules/flow/model/FlowInfo.java diff --git a/src/main/java/com/lz/modules/app/controller/FlowManagerController.java b/src/main/java/com/lz/modules/app/controller/FlowManagerController.java index 9f774d26..24abe7bd 100644 --- a/src/main/java/com/lz/modules/app/controller/FlowManagerController.java +++ b/src/main/java/com/lz/modules/app/controller/FlowManagerController.java @@ -1,11 +1,13 @@ package com.lz.modules.app.controller; import java.util.Arrays; +import java.util.List; import java.util.Map; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.flow.entity.FlowManager; +import com.lz.modules.flow.model.FlowDto; import com.lz.modules.flow.service.FlowManagerService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +42,11 @@ public class FlowManagerController { return R.ok().put("page", page); } + @RequestMapping("/menu/list") + public List menuList(){ + List flowDtoList = flowManagerService.getFowList(); + return flowDtoList; + } /** * 信息 diff --git a/src/main/java/com/lz/modules/flow/model/FlowDto.java b/src/main/java/com/lz/modules/flow/model/FlowDto.java new file mode 100644 index 00000000..e3ddba70 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/FlowDto.java @@ -0,0 +1,30 @@ +package com.lz.modules.flow.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FlowDto { + private static final long serialVersionUID = 1L; + + /** + * 飞书部门id + */ + private String departmentId; + /** + * 飞书上级部门id + */ + private String departmentParentId; + /** + * 飞书显示部门人数 + */ + private String realName; + /** + * 组织架构名称/部门名称 + */ + private String departmentName; + + private List list; + +} diff --git a/src/main/java/com/lz/modules/flow/model/FlowInfo.java b/src/main/java/com/lz/modules/flow/model/FlowInfo.java new file mode 100644 index 00000000..942bb33c --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/FlowInfo.java @@ -0,0 +1,14 @@ +package com.lz.modules.flow.model; + +import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class FlowInfo { + private DepartmentsStaffRelateEntity parentDepartmentRelate; + + private List list; + +} diff --git a/src/main/java/com/lz/modules/flow/service/FlowManagerService.java b/src/main/java/com/lz/modules/flow/service/FlowManagerService.java index 58401241..56f3cbef 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowManagerService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowManagerService.java @@ -3,6 +3,7 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; import com.lz.modules.flow.entity.FlowManager; +import com.lz.modules.flow.model.FlowDto; import java.util.List; import java.util.Map; @@ -37,4 +38,6 @@ public interface FlowManagerService extends IService { PageUtils queryPage(Map params); void deleteBatchIds(List asList); + + List getFowList(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java index 7a0a5692..9dde4f6d 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java @@ -3,14 +3,27 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.NumberUtil; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.dao.DepartmentsDao; +import com.lz.modules.app.dao.StaffDao; +import com.lz.modules.app.entity.DepartmentsEntity; +import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.flow.dao.FlowManagerMapper; import com.lz.modules.flow.entity.FlowManager; +import com.lz.modules.flow.model.FlowDto; +import com.lz.modules.flow.model.FlowInfo; import com.lz.modules.flow.service.FlowManagerService; +import com.lz.modules.flow.service.RecordRoleService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -28,6 +41,18 @@ public class FlowManagerServiceImpl extends ServiceImpl getFowList() { + List tDepartments = departmentsDao.selectAll(); + List parentDepartments = tDepartments.stream() + //根据两个属性进行过滤 + .filter(s -> s.getDepartmentParentId().equals("1")) + .collect(Collectors.toList()); + List departmentsStaffRelateEntities = departmentsStaffRelateService.selectAll(); + Map departmentsStaffRelateEntityMap = new HashMap<>(); + Map singleRelateMap = new HashMap<>(); + + for(DepartmentsStaffRelateEntity d : departmentsStaffRelateEntities){ + singleRelateMap.put(d.getDepartmentId(),d); + if(new Integer(1).equals(d.getIsLeader())){ + FlowInfo flowInfo = new FlowInfo(); + flowInfo.setParentDepartmentRelate(d); + List list = new ArrayList<>(); + for(DepartmentsStaffRelateEntity d2 : departmentsStaffRelateEntities){ + if(d2.getDepartmentId().equals(d.getDepartmentId()) && new Integer(0).equals(d2.getIsLeader())){ + list.add(d2); + } + } + flowInfo.setList(list); + departmentsStaffRelateEntityMap.put(d.getDepartmentId(),flowInfo); + } + } + + List staffEntities = staffDao.selectAll(); + Map staffMap = new HashMap<>(); + for(StaffEntity staffEntity : staffEntities){ + staffMap.put(staffEntity.getId(),staffEntity); + } + List list = new ArrayList<>(); + for (DepartmentsEntity d : parentDepartments) { + String realName = getRealName(departmentsStaffRelateEntityMap,staffMap,d.getDepartmentId(),singleRelateMap); + FlowDto entity = buildMenuEntity(d.getDepartmentId(),d.getDepartmentName() , "1", realName); + List childList = getMenuList(tDepartments, entity,departmentsStaffRelateEntityMap,staffMap,singleRelateMap); + entity.setList(childList); + list.add(entity); + } + return list; + } + + + public FlowDto buildMenuEntity(String departmentId, String departmentName, String parentId, String realName) { + FlowDto flowDto = new FlowDto(); + flowDto.setDepartmentId(departmentId); + flowDto.setDepartmentName(departmentName); + flowDto.setDepartmentParentId(parentId); + flowDto.setRealName(realName); + return flowDto; + } + + + public String getRealName(Map departmentsStaffRelateEntityMap, Map staffMap, String departmentId + , Map singleRelateMap) { + FlowInfo flowInfo = departmentsStaffRelateEntityMap.get(departmentId); + if (flowInfo != null) { + return doGetRealName(flowInfo.getParentDepartmentRelate(), staffMap); + } else { + return doGetRealName(singleRelateMap.get(departmentId), staffMap); + } + } + + public String doGetRealName(DepartmentsStaffRelateEntity departmentsStaffRelateEntity, Map staffMap) { + if (departmentsStaffRelateEntity != null) { + StaffEntity staffEntity = staffMap.get(departmentsStaffRelateEntity.getStaffId()); + if (staffEntity != null) { + return staffEntity.getName(); + } + } + return ""; + } + + public List getMenuList(List tDepartments,FlowDto flowDto, + Map departmentsStaffRelateEntityMap, Map staffMap + ,Map singleRelateMap) { + List flowDtos = new ArrayList<>(); + for(DepartmentsEntity child : tDepartments) { + if (child.getDepartmentParentId().equals(flowDto.getDepartmentId())) { + FlowDto entity = buildMenuEntity(child.getDepartmentId(), + child.getDepartmentName(), flowDto.getDepartmentId(), + getRealName(departmentsStaffRelateEntityMap, staffMap, child.getDepartmentId(),singleRelateMap)); + List list = getMenuList(tDepartments, entity, departmentsStaffRelateEntityMap, staffMap,singleRelateMap); + if (CollectionUtils.isEmpty(list) || list.size() == 0) { + FlowInfo flowInfo = departmentsStaffRelateEntityMap.get(child.getDepartmentId()); + if (flowInfo != null && CollectionUtils.isNotEmpty(flowInfo.getList()) && flowInfo.getList().size() > 0) { + list = new ArrayList<>(); + for (DepartmentsStaffRelateEntity dr : flowInfo.getList()) { + StaffEntity staffEntity = staffMap.get(dr.getStaffId()); + FlowDto childEntiry = buildMenuEntity(dr.getDepartmentId() + "_" + dr.getStaffId(), + staffEntity != null ? staffEntity.getName() : "", + entity.getDepartmentId(), + ""); + list.add(childEntiry); + } + } + } + entity.setList(list); + flowDtos.add(entity); + } + } + return flowDtos; + } + } From d13dbdc42d2869dc2445a1df0f0e348512ea818b Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 23 Sep 2020 11:22:40 +0800 Subject: [PATCH 06/10] =?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/entity/StaffEntity.java | 9 +++++ .../com/lz/modules/flow/model/FlowDto.java | 2 +- .../service/impl/FlowManagerServiceImpl.java | 37 ++++++++++--------- src/main/resources/mapper/sys/SysUserDao.xml | 2 +- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/lz/modules/app/entity/StaffEntity.java b/src/main/java/com/lz/modules/app/entity/StaffEntity.java index c04b2820..3d22e43d 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffEntity.java +++ b/src/main/java/com/lz/modules/app/entity/StaffEntity.java @@ -19,6 +19,15 @@ import lombok.Data; public class StaffEntity implements Serializable { private static final long serialVersionUID = 1L; + public StaffEntity() { + + } + + public StaffEntity(Long id,String name) { + this.id = id; + this.name = name; + } + /** * 自增主键 */ diff --git a/src/main/java/com/lz/modules/flow/model/FlowDto.java b/src/main/java/com/lz/modules/flow/model/FlowDto.java index e3ddba70..ed533cd1 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowDto.java +++ b/src/main/java/com/lz/modules/flow/model/FlowDto.java @@ -24,7 +24,7 @@ public class FlowDto { * 组织架构名称/部门名称 */ private String departmentName; - + private Long staffId; private List list; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java index 9dde4f6d..78a1baaa 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowManagerServiceImpl.java @@ -137,10 +137,11 @@ public class FlowManagerServiceImpl extends ServiceImpl list = new ArrayList<>(); for (DepartmentsEntity d : parentDepartments) { - String realName = getRealName(departmentsStaffRelateEntityMap,staffMap,d.getDepartmentId(),singleRelateMap); - FlowDto entity = buildMenuEntity(d.getDepartmentId(),d.getDepartmentName() , "1", realName); + StaffEntity staff = getStaff(departmentsStaffRelateEntityMap,staffMap,d.getDepartmentId(),singleRelateMap); + FlowDto entity = buildMenuEntity(d.getDepartmentId(),d.getDepartmentName() , "1", staff.getName(),staff.getId()); List childList = getMenuList(tDepartments, entity,departmentsStaffRelateEntityMap,staffMap,singleRelateMap); entity.setList(childList); list.add(entity); @@ -149,46 +150,48 @@ public class FlowManagerServiceImpl extends ServiceImpl departmentsStaffRelateEntityMap, Map staffMap, String departmentId + public StaffEntity getStaff(Map departmentsStaffRelateEntityMap, Map staffMap, String departmentId , Map singleRelateMap) { FlowInfo flowInfo = departmentsStaffRelateEntityMap.get(departmentId); if (flowInfo != null) { - return doGetRealName(flowInfo.getParentDepartmentRelate(), staffMap); + return doGetStaff(flowInfo.getParentDepartmentRelate(), staffMap); } else { - return doGetRealName(singleRelateMap.get(departmentId), staffMap); + return doGetStaff(singleRelateMap.get(departmentId), staffMap); } } - public String doGetRealName(DepartmentsStaffRelateEntity departmentsStaffRelateEntity, Map staffMap) { + public StaffEntity doGetStaff(DepartmentsStaffRelateEntity departmentsStaffRelateEntity, Map staffMap) { if (departmentsStaffRelateEntity != null) { StaffEntity staffEntity = staffMap.get(departmentsStaffRelateEntity.getStaffId()); if (staffEntity != null) { - return staffEntity.getName(); + return staffEntity; } } - return ""; + return new StaffEntity(0l,""); } public List getMenuList(List tDepartments,FlowDto flowDto, - Map departmentsStaffRelateEntityMap, Map staffMap - ,Map singleRelateMap) { + Map departmentsStaffRelateEntityMap, Map staffMap + , Map singleRelateMap) { List flowDtos = new ArrayList<>(); - for(DepartmentsEntity child : tDepartments) { + for (DepartmentsEntity child : tDepartments) { if (child.getDepartmentParentId().equals(flowDto.getDepartmentId())) { + StaffEntity staff = getStaff(departmentsStaffRelateEntityMap, staffMap, child.getDepartmentId(), singleRelateMap); FlowDto entity = buildMenuEntity(child.getDepartmentId(), - child.getDepartmentName(), flowDto.getDepartmentId(), - getRealName(departmentsStaffRelateEntityMap, staffMap, child.getDepartmentId(),singleRelateMap)); - List list = getMenuList(tDepartments, entity, departmentsStaffRelateEntityMap, staffMap,singleRelateMap); + child.getDepartmentName(), flowDto.getDepartmentId(), staff.getName(),staff.getId()); + + List list = getMenuList(tDepartments, entity, departmentsStaffRelateEntityMap, staffMap, singleRelateMap); if (CollectionUtils.isEmpty(list) || list.size() == 0) { FlowInfo flowInfo = departmentsStaffRelateEntityMap.get(child.getDepartmentId()); if (flowInfo != null && CollectionUtils.isNotEmpty(flowInfo.getList()) && flowInfo.getList().size() > 0) { @@ -196,9 +199,9 @@ public class FlowManagerServiceImpl extends ServiceImpl + + diff --git a/src/main/resources/mapper/equipment/TCountMapper.xml b/src/main/resources/mapper/equipment/TCountMapper.xml index de55da27..adcba9e1 100644 --- a/src/main/resources/mapper/equipment/TCountMapper.xml +++ b/src/main/resources/mapper/equipment/TCountMapper.xml @@ -66,14 +66,18 @@ - update equipment_t_count set is_delete = 1 where id=#{id} limit 1 + update equipment_t_count set is_delete = 1 where id=#{id} and is_delete = 0 limit 1 + + From e8e7ad6f165714e6a0b0b7424bea031e41fbb058 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 23 Sep 2020 16:52:19 +0800 Subject: [PATCH 09/10] =?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 --- .../java/com/lz/common/utils/Constant.java | 3 + .../app/controller/FlowManagerController.java | 34 +++++++++ .../app/controller/TestController.java | 73 +++++++++++++++++++ .../lz/modules/app/enums/FlowNodeEnum.java | 35 +++++++++ .../com/lz/modules/flow/model/FlowModel.java | 17 +++++ .../lz/modules/flow/model/FormDataModel.java | 11 +++ .../lz/modules/flow/model/RuleGroupModel.java | 10 +++ .../app/impl/ResultDetailServiceImpl.java | 5 +- .../app/impl/ResultRecordServiceImpl.java | 2 +- 9 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java create mode 100644 src/main/java/com/lz/modules/flow/model/FlowModel.java create mode 100644 src/main/java/com/lz/modules/flow/model/FormDataModel.java create mode 100644 src/main/java/com/lz/modules/flow/model/RuleGroupModel.java diff --git a/src/main/java/com/lz/common/utils/Constant.java b/src/main/java/com/lz/common/utils/Constant.java index c7705ffd..4bb7f175 100644 --- a/src/main/java/com/lz/common/utils/Constant.java +++ b/src/main/java/com/lz/common/utils/Constant.java @@ -167,6 +167,9 @@ public class Constant { public static final String SELF = "self"; public static final String TYPE = "type"; + public static final String node = "node"; + public static final String startNode = "startNode"; + public static final String OSS_BUCCKET = "my-wallet"; public static final Integer TWO = 2; public static final Integer ONE = 1; diff --git a/src/main/java/com/lz/modules/app/controller/FlowManagerController.java b/src/main/java/com/lz/modules/app/controller/FlowManagerController.java index 0d398377..65d5556c 100644 --- a/src/main/java/com/lz/modules/app/controller/FlowManagerController.java +++ b/src/main/java/com/lz/modules/app/controller/FlowManagerController.java @@ -1,14 +1,21 @@ package com.lz.modules.app.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.resp.Step; import com.lz.modules.flow.entity.Flow; +import com.lz.modules.flow.entity.FlowDepartment; import com.lz.modules.flow.entity.FlowManager; +import com.lz.modules.flow.entity.FlowRelation; import com.lz.modules.flow.model.FlowDto; +import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.service.FlowDepartmentService; import com.lz.modules.flow.service.FlowManagerService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -71,6 +78,33 @@ public class FlowManagerController { public R flowInfo(@PathVariable("staffId") Long staffId){ return flowDepartmentService.selectFlowManager(staffId); + + } + + + + /** + * 信息 + */ + @RequestMapping("/get/flow/{id}") + public R flow(@PathVariable("id") Long staffId){ + + + + + + + return R.ok(); + } + + + /** + * 信息 + */ + @RequestMapping("/save/flow") + public R saveFlow(Long id ,String data){ + + return R.ok(); } /** 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 02c19cce..829e1482 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -1,18 +1,26 @@ package com.lz.modules.app.controller; +import com.alibaba.fastjson.JSON; import com.lz.modules.app.dao.DepartmentsDao; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; +import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.model.FlowModel; import com.lz.modules.sys.entity.app.ResultRecord; +import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.swing.*; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -26,6 +34,12 @@ public class TestController { private DepartmentsService departmentsService; + @Autowired + private ResultDetailService resultDetailService; + + @Autowired + private StaffService staffService; + @Autowired private DepartmentsStaffRelateService departmentsStaffRelateService; @@ -72,4 +86,63 @@ public class TestController { departmentsStaffRelateService.updateById(l); } } + + /** + * { + * "type": "node", + * "left": 818, + * "top": 510, + * "uuid": "id3", + * "prev": [ + * "id1", + * "id2" + * ], + * "next": [ + * "id4", + * "id5" + * ], + * "formData": { + * "stepName": "名称1", + * "ruleGroupList": [{ + * "name": "名称2", + * "nextStep": "id5" + * }, + * { + * "name": "名称6", + * "nextStep": "id7" + * } + * ] + * }, + * "nextIfId": "id12", + * "nextElseId": "id11" + * } + */ + @RequestMapping("/test/step") + public void step(){ + Long staffId = 294l; + ResultRecord resultRecord = new ResultRecord(); + resultRecord.setType(2); + resultRecord.setStaffId(staffId); + DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(resultRecord.getStaffId()); + resultRecord.setDepartmentId(departmentsStaffRelateEntity.getDepartmentId()); + List test = resultDetailService.getStepList(resultRecord); + List list = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(test)){ + Step step = test.get(0); + StaffEntity staffEntity = staffService.selectStaffById(staffId); + if(staffEntity !=null && !staffEntity.getName().equals(step.getName())){ + list.add(staffEntity.getName()); + } + for(Step s:test){ + list.add(s.getName()); + } + } + System.out.println(JSON.toJSONString(list)); + List flowModels = new ArrayList<>(); + FlowModel flowModel = new FlowModel(); + + for(String s:list){ + + } + } } diff --git a/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java new file mode 100644 index 00000000..e2551d07 --- /dev/null +++ b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java @@ -0,0 +1,35 @@ +package com.lz.modules.app.enums; + +public enum FlowNodeEnum { + + startNode("开始", "startNode"), + endNode("结束", "endNode"), + tempNode("案例", "tempNode"), + ifNode("条件", "ifNode"), + expandNode("分组", "expandNode"), + nodeNode("节点", "nodeNode"); + + private String name; + private String desc ; + + FlowNodeEnum(String name, String desc) { + this.name = name; + this.desc = desc; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/src/main/java/com/lz/modules/flow/model/FlowModel.java b/src/main/java/com/lz/modules/flow/model/FlowModel.java new file mode 100644 index 00000000..6ef5fcfe --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/FlowModel.java @@ -0,0 +1,17 @@ +package com.lz.modules.flow.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FlowModel { + private String type; + private int left = 818; + private int top = 510; + private String uuid; + private List prev; + private List next; + private FormDataModel formData; + +} diff --git a/src/main/java/com/lz/modules/flow/model/FormDataModel.java b/src/main/java/com/lz/modules/flow/model/FormDataModel.java new file mode 100644 index 00000000..bb950fd2 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/FormDataModel.java @@ -0,0 +1,11 @@ +package com.lz.modules.flow.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FormDataModel { + private String stepName; + private List ruleGroupList; +} diff --git a/src/main/java/com/lz/modules/flow/model/RuleGroupModel.java b/src/main/java/com/lz/modules/flow/model/RuleGroupModel.java new file mode 100644 index 00000000..603bb0ca --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/RuleGroupModel.java @@ -0,0 +1,10 @@ +package com.lz.modules.flow.model; + +import lombok.Data; + +@Data +public class RuleGroupModel { + private String name; + private String nextStep; + +} diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index 734b42f5..ae93f0db 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -216,8 +216,6 @@ public class ResultDetailServiceImpl extends ServiceImpl stepList = new ArrayList<>(); StaffEntity mySelf = staffService.selectStaffById(staffId); - - List flowRecordList = flowRecordService.selectFlowRecordByResultRecordIdFlowId(resultRecord.getId()); SimpleDateFormat myFmt2 = new SimpleDateFormat("MM-dd HH:mm"); FlowRecord lastFlowRecord = null; @@ -231,7 +229,6 @@ public class ResultDetailServiceImpl extends ServiceImpl approvalList = new ArrayList<>(); Map roleNameMap = new HashMap<>(); @@ -244,7 +241,6 @@ public class ResultDetailServiceImpl extends ServiceImpl flowRelations = flowRelationService.selectFlowRelationAll(); Map staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p)); - Long flowId = flowInfo.getFirst(); List flows = flowService.selectByFlowId(flowId); @@ -276,6 +272,7 @@ public class ResultDetailServiceImpl extends ServiceImpl Date: Wed, 23 Sep 2020 17:40:49 +0800 Subject: [PATCH 10/10] =?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/common/utils/Constant.java | 4 ++++ .../app/controller/ResultRecordController.java | 12 +++++++----- .../java/com/lz/modules/app/enums/FlowNodeEnum.java | 4 ++++ .../modules/sys/service/app/ResultDetailService.java | 2 +- .../service/app/impl/ResultDetailServiceImpl.java | 12 +++++++----- .../service/app/impl/ResultRecordServiceImpl.java | 3 +-- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/lz/common/utils/Constant.java b/src/main/java/com/lz/common/utils/Constant.java index 4bb7f175..45a67c5f 100644 --- a/src/main/java/com/lz/common/utils/Constant.java +++ b/src/main/java/com/lz/common/utils/Constant.java @@ -8,6 +8,8 @@ package com.lz.common.utils; +import sun.jvm.hotspot.oops.ShortField; + /** * 常量 * @@ -173,4 +175,6 @@ public class Constant { public static final String OSS_BUCCKET = "my-wallet"; public static final Integer TWO = 2; public static final Integer ONE = 1; + public static final String WENHUAJIAZHIGUAN = "

做人：相信、包容、担当 

做事：用户第一、求真、极致

"; + public static final String WENHUAJIAZHIGUAN_TARGET = "

做人：相信、包容、担当  3.5分

1、尊重合作伙伴，坚决维护公司形象
2、倾听不同意见，积极参加各类公司项目活动，通过正确渠道（直属上级/部门负责人/HR）反馈问题提出改进意见；决策前充分讨论，决策后无论个人是否有异议，必须从言行上完全予以支持
3、严格遵守公司规章制度，遇事不推诿、不甩锅，勇于承担责任
4、实事求是，诚实守信，独立自主思考，珍惜彼此时间无需他人监督催促，客观反馈问题，遇到bug/工作问题，以查到底
5、今日事今日毕，按时汇报工作，今天的表现是明天最低的要求，不断追求更好的结果
6、以客户为中心，提供专业服务，做好公司内外部协作，无实质投诉
3.75分
1、拥抱变化，对公司不同层面的调整，持乐见状态，并予以高度支持配合
2、以团队目标为导向，包容不同类型的伙伴，不将个人喜好带入工作，接受更优秀的人才与思想，取长补短，互相成就
3、勇于接受挑战承担责任，为实现目标全力以赴，主动分享业务知识与经验，正面影响团队，改善团队士气与氛围
4、深入理解公司业务与部门协作方式，保持好奇心，以结果倒推需求，持续思考“为什么做”，辩证思考执行，保证大方向的正确与工作方式的持续迭代
5、对日常工作有极致要求，多角度对问题进行辩证探究，不钻牛角尖不随风摇摆，以最佳结果为导向持续倒逼更优方案
6、辨证看待用户意见，要以“用户为师”的心态坚持原则寻求解决，最终达到用户和公司都受益的结果"; } 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 5df40909..da9b9341 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -154,7 +154,7 @@ public class ResultRecordController extends AbstractController { @RequestMapping("/getStaffResultDetail") public R getStaffResultDetail(ResultRecordReq req) { int yeJiCheckNum = 0; - int wenHuaJiaZhiGuanNum = 0; + int wenHuaJiaZhiGuanNum = 1; int lastResultNum = 2; int commentNum = 0; int recordType = req.getRecordType(); @@ -228,18 +228,14 @@ public class ResultRecordController extends AbstractController { list.add(resp); } if (tempType2 == 0) { - wenHuaJiaZhiGuanNum = 2; list.add(resultDetailService.getYeJiKaoHe(BigDecimal.ZERO)); list.add(resultDetailService.getWenHuaJiaZhiGua1(auth)); - list.add(resultDetailService.getWenHuaJiaZhiGua2(auth)); } } else { yeJiCheckNum = 1; - wenHuaJiaZhiGuanNum = 2; list.add(resultDetailService.getYeJi()); list.add(resultDetailService.getYeJiKaoHe(BigDecimal.ZERO)); list.add(resultDetailService.getWenHuaJiaZhiGua1(auth)); - list.add(resultDetailService.getWenHuaJiaZhiGua2(auth)); } list.add(resultDetailService.getWenHuaJiaZhiGuaResult1(sumWenHuaJiaZhiGuan)); list.add(resultDetailService.getWenHuaJiaZhiGuaResult2()); @@ -529,12 +525,18 @@ public class ResultRecordController extends AbstractController { ResultDetail old = resultDetailService.selectResultDetailById(req.getId()); if (old != null) { com.lz.modules.app.utils.BeanUtils.copyProperty(old, req, false); + if(old.getType().equals(2)){ + old.setTarget(Constant.WENHUAJIAZHIGUAN); + } resultDetailService.updateResultDetailById(old); } else { ResultDetail resultDetail = new ResultDetail(); BeanUtils.copyProperties(req, resultDetail); resultDetail.setRecordId(resultRecord.getId()); resultDetail.setStaffId(resultRecord.getStaffId()); + if(req.getType().equals(2)){ + resultDetail.setTarget(Constant.WENHUAJIAZHIGUAN); + } resultDetailService.insertResultDetail(resultDetail); } List resultDetails = resultDetailService.selectByRecordId(resultRecord.getId()); diff --git a/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java index e2551d07..d5f6cc47 100644 --- a/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java +++ b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java @@ -32,4 +32,8 @@ public enum FlowNodeEnum { public void setDesc(String desc) { this.desc = desc; } + + public static void main(String[] args) { + System.out.println(FlowNodeEnum.endNode.desc); + } } diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java index 2bc7186a..af396fe7 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java @@ -56,7 +56,7 @@ public interface ResultDetailService extends IService { ResultDetailResp getLastResult(BigDecimal bigDecimal); - void insertWenHuaJiaZhiGua(String s, Long id, Long userId); + void insertWenHuaJiaZhiGua(String s, Long id, Long userId,BigDecimal checkWeight); String initRole(Long staffId, Long l); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index ae93f0db..d5d8afed 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -3,6 +3,7 @@ package com.lz.modules.sys.service.app.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.BigDecimalUtil; +import com.lz.common.utils.Constant; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.resp.ResultDetailResp; @@ -139,17 +140,17 @@ public class ResultDetailServiceImpl extends ServiceImpl