From a444640a23e2715a72fa5e30beccbd5f90287054 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 28 Aug 2020 18:08:20 +0800 Subject: [PATCH] =?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/StringUtil.java | 31 ++--- .../controller/ResultRecordController.java | 12 ++ .../lz/modules/app/resp/ResultDetailResp.java | 5 + .../java/com/lz/modules/app/resp/Step.java | 24 ++++ .../lz/modules/flow/dao/FlowRecordMapper.java | 2 + .../java/com/lz/modules/flow/model/Auth.java | 2 + .../lz/modules/flow/req/ResultDetailReq.java | 6 + .../flow/service/FlowRecordService.java | 2 + .../service/impl/FlowRecordServiceImpl.java | 5 + .../service/impl/RecordAuthServiceImpl.java | 3 +- .../modules/sys/entity/app/ResultDetail.java | 47 +++++-- .../sys/service/app/ResultDetailService.java | 4 + .../sys/service/app/ResultRecordService.java | 3 + .../app/impl/ResultDetailServiceImpl.java | 130 +++++++++++++++++- .../app/impl/ResultRecordServiceImpl.java | 39 +++--- .../mapper/app/ResultDetailMapper.xml | 13 +- .../mapper/flow/FlowRecordMapper.xml | 5 + src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 18 files changed, 286 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/resp/Step.java diff --git a/src/main/java/com/lz/common/utils/StringUtil.java b/src/main/java/com/lz/common/utils/StringUtil.java index 5b6c748b..756ca133 100644 --- a/src/main/java/com/lz/common/utils/StringUtil.java +++ b/src/main/java/com/lz/common/utils/StringUtil.java @@ -356,23 +356,6 @@ public class StringUtil extends StringUtils { - /** - * - * - * @param args - */ - - public static void main(String[] args) { - Set set = new HashSet<>( ); - for(long i = 0 ;i < 2000000 ;i ++){ - String a = getThirdNo("jdk","2",i); - set.add(a); - } - System.out.println(set.size()); - - - - } public static String removeDoubleChar(String str){ if(str.indexOf("\"")==0) { str = str.substring(1, str.length()); //去掉第一个 " @@ -650,4 +633,18 @@ public class StringUtil extends StringUtils { } return html.replaceAll("\\<.*?>",""); } + + public static String realNameTo2(String value) { + if(StringUtil.isBlank(value)){ + return ""; + } + if(value.length() > 2 ){ + return value.substring(value.length()-2); + } + return value; + } + public static void main(String[] args) { + + System.out.println(realNameTo2("xxxxx")); + } } 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 544f2154..204f0149 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -9,6 +9,7 @@ import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.resp.ResultDetailResp; +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; @@ -191,6 +192,7 @@ public class ResultRecordController extends AbstractController { } List resultDetails = resultDetailService.selectByRecordId(resultRecord.getId()); + List stepList = resultDetailService.getStepList(resultRecord); BigDecimal sumWenHuaJiaZhiGuan = BigDecimal.ZERO; BigDecimal sumYeJi = BigDecimal.ZERO; if (CollectionUtils.isNotEmpty(resultDetails)) { @@ -288,6 +290,7 @@ public class ResultRecordController extends AbstractController { .put("commentNum", commentNum) .put("superStaff", superStaff) .put("fileCount",fileCount) + .put("stepList",stepList) ; } @@ -325,6 +328,13 @@ public class ResultRecordController extends AbstractController { flowRecordService.updateFlowRecordById(flowRecord); } } + + // 可能会被删除 + FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(req.getRecordResultId()); + lastFlowRecord.setGmtCreate(new Date()); + lastFlowRecord.setGmtModified(new Date()); + flowRecordService.insertFlowRecord(lastFlowRecord);// 新插入一条提交记录 + StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId()); r = R.ok("成功") .put("from", mySelf) @@ -546,6 +556,8 @@ public class ResultRecordController extends AbstractController { public R detailAddOrUpdate(ResultDetailReq req) { ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordId()); req.setKeyResult(StringUtil.decodeBase64(req.getKeyResult())); + req.setKeyResult35(StringUtil.decodeBase64(req.getKeyResult35())); + req.setKeyResult37(StringUtil.decodeBase64(req.getKeyResult37())); req.setCheckResult(StringUtil.decodeBase64(req.getCheckResult())); req.setScoreComment(StringUtil.decodeBase64(req.getScoreComment())); ResultDetail old = resultDetailService.selectResultDetailById(req.getId()); diff --git a/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java b/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java index a005ea43..30de0e20 100644 --- a/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java +++ b/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java @@ -43,4 +43,9 @@ public class ResultDetailResp { private int isAdd; private int isEdit; + + private String keyResult35; + //关键结果3.7分标准 + private String keyResult37; + } diff --git a/src/main/java/com/lz/modules/app/resp/Step.java b/src/main/java/com/lz/modules/app/resp/Step.java new file mode 100644 index 00000000..231e07f1 --- /dev/null +++ b/src/main/java/com/lz/modules/app/resp/Step.java @@ -0,0 +1,24 @@ +package com.lz.modules.app.resp; + +import lombok.Data; + +@Data +public class Step { + private String name ; + private String time ; + private int status ; + private String statusStr; + public Step() { + + + + + } + + public Step(String name, String time, int status, String statusStr) { + this.name = name; + this.time = time; + this.status = status; + this.statusStr = statusStr; + } +} 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 898cc3bb..55d53567 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -40,4 +40,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByRecordId(@Param("recordId") Long recordId); List selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId, @Param("rollbackFlowId") Long rollbackFlowId); + + List selectFlowRecordByFlowId(@Param("recordId") Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/Auth.java b/src/main/java/com/lz/modules/flow/model/Auth.java index 341dacd7..0a64abd0 100644 --- a/src/main/java/com/lz/modules/flow/model/Auth.java +++ b/src/main/java/com/lz/modules/flow/model/Auth.java @@ -24,4 +24,6 @@ public class Auth { private int approvelCommit; private int uploadFile; private int downFile; + private int keyResult35; + private int keyResult37; } diff --git a/src/main/java/com/lz/modules/flow/req/ResultDetailReq.java b/src/main/java/com/lz/modules/flow/req/ResultDetailReq.java index bbf4d22b..f4fdfee1 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultDetailReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultDetailReq.java @@ -42,4 +42,10 @@ public class ResultDetailReq { private int page = 1; private int limit = 10 ; + //关键结果_3.5标准 + private String keyResult35; + //关键结果3.7分标准 + private String keyResult37; + + } diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java index 988598e3..ccbfd0fc 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -42,4 +42,6 @@ public interface FlowRecordService extends IService { void initFlowRecord(ResultRecord resultRecord , Long roleId , Integer type , String name); List selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId); + + List selectFlowRecordByFlowId(Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java index b2628fcc..6d2e3358 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java @@ -110,5 +110,10 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByFlowId(Long recordId) { + return flowRecordMapper.selectFlowRecordByFlowId(recordId); + } + } 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 19ae7d35..d88173e6 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 @@ -123,7 +123,8 @@ public class RecordAuthServiceImpl extends ServiceImpl*业绩详情表 * @author quyixiao -* @since 2020-08-13 +* @since 2020-08-28 */ @Data @@ -32,6 +32,10 @@ public class ResultDetail implements java.io.Serializable { private String target; //关键结果 private String keyResult; + //关键结果_3.5标准 + private String keyResult35; + //关键结果3.7分标准 + private String keyResult37; //考核权重 private BigDecimal checkWeight; //考核结果 @@ -48,15 +52,6 @@ public class ResultDetail implements java.io.Serializable { private Long staffId; //优先级，从大到小 private Integer priority; - - public ResultDetail() { - - } - - public ResultDetail(Integer type) { - this.type = type; - } - /** * * @return @@ -162,6 +157,36 @@ public class ResultDetail implements java.io.Serializable { this.keyResult = keyResult; } + /** + * 关键结果_3.5标准 + * @return + */ + public String getKeyResult35() { + return keyResult35; + } + /** + * 关键结果_3.5标准 + * @param keyResult35 + */ + public void setKeyResult35(String keyResult35) { + this.keyResult35 = keyResult35; + } + + /** + * 关键结果3.7分标准 + * @return + */ + public String getKeyResult37() { + return keyResult37; + } + /** + * 关键结果3.7分标准 + * @param keyResult37 + */ + public void setKeyResult37(String keyResult37) { + this.keyResult37 = keyResult37; + } + /** * 考核权重 * @return @@ -292,6 +317,8 @@ public class ResultDetail implements java.io.Serializable { ",type=" + type + ",target=" + target + ",keyResult=" + keyResult + + ",keyResult35=" + keyResult35 + + ",keyResult37=" + keyResult37 + ",checkWeight=" + checkWeight + ",checkResult=" + checkResult + ",superScore=" + superScore + 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 d53960c6..ee4afdd6 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 @@ -3,8 +3,10 @@ package com.lz.modules.sys.service.app; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.BigDecimalUtil; import com.lz.modules.app.resp.ResultDetailResp; +import com.lz.modules.app.resp.Step; import com.lz.modules.flow.model.Auth; import com.lz.modules.sys.entity.app.ResultDetail; +import com.lz.modules.sys.entity.app.ResultRecord; import java.math.BigDecimal; import java.util.List; @@ -57,4 +59,6 @@ public interface ResultDetailService extends IService { void insertWenHuaJiaZhiGua(String s, Long id, Long userId); String initRole(Long staffId, Long l); + + List getStepList(ResultRecord resultRecord); } \ No newline at end of file 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 542badd4..74149367 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 @@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.utils.t.TwoTuple; +import com.lz.modules.flow.entity.Flow; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; @@ -57,4 +58,6 @@ public interface ResultRecordService extends IService { ResultRecord initResult(Long staffId ,Integer recordType,Long roleId) ; R checkApproval(Long recordId); + + int getDepartmentLevelIndex(List list, int flowIndex); } \ No newline at end of file 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 8461e727..13f8db1e 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,18 +3,31 @@ 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.StringUtil; +import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.resp.ResultDetailResp; +import com.lz.modules.app.resp.Step; +import com.lz.modules.app.service.DepartmentsService; +import com.lz.modules.app.service.StaffService; +import com.lz.modules.app.utils.t.TwoTuple; +import com.lz.modules.flow.entity.*; import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.model.StaffRoleDto; +import com.lz.modules.flow.service.*; import com.lz.modules.sys.dao.app.ResultDetailMapper; import com.lz.modules.sys.entity.app.ResultDetail; +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 lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** *

@@ -26,12 +39,24 @@ import java.util.List; */ @Service +@Slf4j public class ResultDetailServiceImpl extends ServiceImpl implements ResultDetailService { - @Autowired + @Autowired private ResultDetailMapper resultDetailMapper; + @Autowired + private StaffService staffService; + + @Autowired + private ResultRecordService resultRecordService; + + @Autowired + private FlowRelationService flowRelationService; + + @Autowired + private StaffRoleService staffRoleService; @Override @@ -40,6 +65,18 @@ public class ResultDetailServiceImpl extends ServiceImpl getStepList(ResultRecord resultRecord) { + Long staffId = resultRecord.getStaffId(); + int type = resultRecord.getType(); + String departmentId = resultRecord.getDepartmentId(); + List stepList = new ArrayList<>(); + + StaffEntity mySelf = staffService.selectStaffById(staffId); + TwoTuple> flowInfo = resultRecordService.getFlowInfo(staffId, type); + Long flowId = flowInfo.getFirst(); + List list = flowInfo.getSecond(); + List flowRelations = flowRelationService.selectFlowRelationAll(); + Map staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p)); + //approvalList = [ME,ONE_D,TWO_D,HR,BOSS] + List approvalList = new ArrayList<>(); + Map roleNameMap = new HashMap<>(); + approvalList.add("ME"); + roleNameMap.put("ME",mySelf.getName()); + for (FlowRelation flowRelation : flowRelations) { + FlowDepartment flowDepartment = staffEntityMap.get(flowRelation.getChild()); + if (flowDepartment != null || flowRelation.getCanReplace() == 0) { + approvalList.add(flowRelation.getChild()); + String departmentLevel = flowRelation.getChild(); + if(flowDepartment != null ){ + StaffEntity flowStaff = staffService.selectStaffById(flowDepartment.getStaffId()); + roleNameMap.put(departmentLevel,flowStaff.getName()); + }else{ + List staffRoles = staffRoleService.selectByRole(departmentLevel); + Long approvalStaffId = 0l; + for (StaffRole staffRole : staffRoles) { + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + Map departmentIdMap = departmentsService.selectUserAllDepartmentIds(departmentId); + for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { + String value = departmentIdMap.get(staffRoleDepartment.getDepartmentId()); + if (StringUtil.isNotBlank(value)) { + approvalStaffId =staffRole.getStaffId(); + break; + } + } + } + StaffEntity flowStaff = staffService.selectStaffById(approvalStaffId); + roleNameMap.put(departmentLevel,flowStaff.getName()); + } + } + } + log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) + " roleNameMap : " + JSON.toJSONString(roleNameMap)); + List flows = flowService.selectByFlowId(flowId); + List flowRecordList = flowRecordService.selectFlowRecordByFlowId(resultRecord.getId()); + SimpleDateFormat myFmt2 = new SimpleDateFormat("MM-dd HH:mm"); + FlowRecord lastFlowRecord = null; + if (CollectionUtils.isNotEmpty(flowRecordList)) { + int status = 0; + int index = 0; + for (FlowRecord flowRecord : flowRecordList) { + String name = roleNameMap.get(flowRecord.getDepartmentLevel()); + String time = myFmt2.format(flowRecord.getGmtCreate()); + String statusStr = "通过"; + if (flowRecord.getStatus().equals(0)) { + if (status == 1) { + statusStr = "驳回"; + } + lastFlowRecord = flowRecord; + status = 0; + } else if (flowRecord.getStatus().equals(1)) { + status = 1; + } + if (index == flowRecordList.size() - 1) { + stepList.add(new Step(name, time, 1, "审批中" )); + } else { + stepList.add(new Step(name, time, 1, index == 0 ? "提交" : statusStr)); + } + index++; + } + } + int flowIndex = lastFlowRecord != null ? lastFlowRecord.getFlowIndex() + 1 : 1; + log.info("flowIndex = " + flowIndex); + for (int i = flowIndex; i < flowIndex + 10; i++) { + int index = resultRecordService.getDepartmentLevelIndex(flows, i); + if (index < 0 || index >= approvalList.size()) { + break; + } + String departmentLevel = approvalList.get(index); + stepList.add(new Step(roleNameMap.get(departmentLevel), "", 0, "")); + } + return stepList; + } + } 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 caee497f..c3cce562 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 @@ -392,22 +392,7 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoles = staffRoleService.selectByRole(departmentLevel); - for (StaffRole staffRole : staffRoles) { - List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); - Map departmentIdMap = departmentsService.selectUserAllDepartmentIds(resultRecord.getDepartmentId()); - for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { - String value = departmentIdMap.get(staffRoleDepartment.getDepartmentId()); - if (StringUtil.isNotBlank(value)) { - StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), roleId != null && roleId > 0 ? roleId : - TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(), resultRecord.getType())); - staffRoleDtos.add(staffRoleDto); - } - } - } - if (staffRoleDtos.size() >= 1) { //表示只有一个审批的用户 - approvalStaff = staffService.selectStaffById(staffRoleDtos.get(0).getStaffId()); - } + approvalStaff = getApprovalStaff(resultRecord, departmentLevel, approvalStaff, staffRoleDtos, roleId); } else { approvalStaff = staffService.selectStaffById(flowD.getStaffId()); StaffRoleDto staffRoleDto = new StaffRoleDto(approvalStaff.getId(), roleId); @@ -433,12 +418,34 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoleDtos, Long roleId) { + List staffRoles = staffRoleService.selectByRole(departmentLevel); + for (StaffRole staffRole : staffRoles) { + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + Map departmentIdMap = departmentsService.selectUserAllDepartmentIds(resultRecord.getDepartmentId()); + for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { + String value = departmentIdMap.get(staffRoleDepartment.getDepartmentId()); + if (StringUtil.isNotBlank(value)) { + StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), roleId != null && roleId > 0 ? roleId : + TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(), resultRecord.getType())); + staffRoleDtos.add(staffRoleDto); + } + } + } + if (staffRoleDtos.size() >= 1) { //表示只有一个审批的用户 + approvalStaff = staffService.selectStaffById(staffRoleDtos.get(0).getStaffId()); + } + return approvalStaff; + } + @Override public List selectResultRecordByIds(List recordIds) { return resultRecordMapper.selectResultRecordByIds(recordIds); } + @Override public int getDepartmentLevelIndex(List list, int flowIndex) { if (flowIndex > list.size()) { return -1 ; diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index d30cb50c..3dae9e21 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -11,6 +11,8 @@ + + @@ -24,7 +26,7 @@ - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, type AS type, target AS target, key_result AS keyResult, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, staff_id AS staffId, priority AS priority + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, type AS type, target AS target, key_result AS keyResult, key_result_3_5 AS keyResult35, key_result_3_7 AS keyResult37, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, staff_id AS staffId, priority AS priority @@ -40,6 +42,8 @@ type, target, key_result, + key_result_3_5, + key_result_3_7, check_weight, check_result, super_score, @@ -55,6 +59,8 @@ #{ type}, #{ target}, #{ keyResult}, + #{ keyResult35}, + #{ keyResult37}, #{ checkWeight}, #{ checkResult}, #{ superScore}, @@ -79,6 +85,8 @@ type = #{type}, target = #{target}, key_result = #{keyResult}, + key_result_3_5 = #{keyResult35}, + key_result_3_7 = #{keyResult37}, check_weight = #{checkWeight}, check_result = #{checkResult}, super_score = #{superScore}, @@ -102,6 +110,8 @@ type = #{type}, target = #{target}, key_result = #{keyResult}, + key_result_3_5 = #{keyResult35}, + key_result_3_7 = #{keyResult37}, check_weight = #{checkWeight}, check_result = #{checkResult}, super_score = #{superScore}, @@ -120,6 +130,7 @@ + diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index ec3c3e56..4af9030a 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -134,5 +134,10 @@ + + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index b351f187..52c8fa88 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_result_record")); + list.add(new TablesBean("lz_result_detail")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();