From 3f11ca66971016e4b7e522c394d2ac0ffaae5dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 14 May 2024 15:23:03 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E4=BA=91=E7=AB=8B=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/YlfServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java index 9402830a5..2556736cc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java @@ -41,7 +41,7 @@ public class YlfServiceImpl implements YlfService { if (status != 200) { String msg = (String) JSONObject.parseObject(forObject, JSONObject.class).get("msg"); log.info("获取云立方装修公司信息失败,id:{}", id); - throw new ServiceException(ErrorCodeEnum.YLF_ERROR,msg); + throw new ServiceException(msg); } Object data = JSONObject.parseObject(forObject, JSONObject.class).get("data"); if (data == null) { @@ -53,7 +53,7 @@ public class YlfServiceImpl implements YlfService { return list.get(0); } } catch (Exception e) { - throw new ServiceException(((ServiceException)e).getErrorMessage()); + throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); } return null; } @@ -73,7 +73,7 @@ public class YlfServiceImpl implements YlfService { if (status != 200) { log.info("获取云立方装修公司信息失败,storeNum:{}", storeNum); String msg = (String) jsonObject.get("msg"); - throw new ServiceException(ErrorCodeEnum.YLF_ERROR,msg); + throw new ServiceException(msg); } JSONObject data = jsonObject.getJSONObject("data"); log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject); @@ -95,7 +95,7 @@ public class YlfServiceImpl implements YlfService { } } catch (Exception e) { log.info("调用云立方获取项目列表异常,getProjectList error:{}", e); - throw new ServiceException(((ServiceException)e).getErrorMessage()); + throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); } return null; From 290aedb9b0c567e94276b88a357921233710cf13 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Tue, 14 May 2024 15:27:45 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/vo/AssessmentUserTrainingVO.java | 12 ++++++++++++ .../service/impl/EmployeeTrainingServiceImpl.java | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java index 0332bd213..ea72ec4c4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java @@ -106,6 +106,18 @@ public class AssessmentUserTrainingVO { @ApiModelProperty("所属区域") private String regionNodeName; + /** + * 考核项数 + */ + @ApiModelProperty("考核项数") + private Integer assessmentNum; + + /** + * 考核总项数 + */ + @ApiModelProperty("考核总项数") + private Integer assessmentTotalNum; + @ApiModelProperty("考核数据") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index b04605fde..fea6cc85f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -500,7 +500,8 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); } } - + assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum()); + assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum()); assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore()); assessmentUserTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus()); assessmentUserTrainingVO.setId(tempUserDetailDO.getId()); From 285040e2b3a384d70bbdc1e7cbefd3d404d3f91f Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 14 May 2024 15:54:59 +0800 Subject: [PATCH 03/25] throw exception --- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 059bd609a..423ff570c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -292,9 +292,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Override public AddSignFranchiseResponse getSignFranchise(Long shopId) { SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); - if (Objects.isNull(signFranchiseDO)) { - throw new ServiceException(ErrorCodeEnum.SIGN_FRANCHISE_NOT_FOUND); - } AddSignFranchiseResponse response = from(signFranchiseDO, shopId); ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId()); if (Objects.nonNull(shopAuditInfoDO)) { From e00d1854351333dad47b9207f098371e181c43d3 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 14 May 2024 16:04:50 +0800 Subject: [PATCH 04/25] getSignFranchise --- .../cool/store/service/impl/SignFranchiseServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 423ff570c..ffb547265 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -293,7 +293,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu public AddSignFranchiseResponse getSignFranchise(Long shopId) { SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); AddSignFranchiseResponse response = from(signFranchiseDO, shopId); - ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId()); + ShopAuditInfoDO shopAuditInfoDO = null; + if (Objects.nonNull(signFranchiseDO)) { + shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId()); + } if (Objects.nonNull(shopAuditInfoDO)) { response.setStatus(shopAuditInfoDO.getResultType()); if (shopAuditInfoDO.getResultType() == 0) { From daefaf439799ff40f75b15f599192fc38546df08 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Tue, 14 May 2024 16:33:27 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/EmployeeTrainingDAO.java | 4 ++-- .../src/main/resources/mapper/EmployeeTrainingMapper.xml | 6 ++++++ .../store/service/impl/EmployeeTrainingServiceImpl.java | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java index ecd6e012a..66ecc0f80 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java @@ -75,7 +75,7 @@ public class EmployeeTrainingDAO { statusList.add(3); Example example = new Example(EmployeeTrainingDO.class); example.createCriteria().andCondition("assessment_num = assessment_total_num").andEqualTo("theoretical_exam_status", 0) - .andIn("assessment_status", statusList); + .andIn("assessmentStatus", statusList); return employeeTrainingMapper.selectByExample(example); } @@ -84,7 +84,7 @@ public class EmployeeTrainingDAO { statusList.add(0); statusList.add(1); Example example = new Example(EmployeeTrainingDO.class); - example.createCriteria().andIn("assessment_status", statusList); + example.createCriteria().andIn("assessmentStatus", statusList); return employeeTrainingMapper.selectCountByExample(example); } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml index b64ff8c6b..89fe5b1a6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml @@ -143,6 +143,12 @@ and u.shop_id = #{shopId} + + and e.assessment_total_num > e.assessment_num + + + and e.assessment_total_num = e.assessment_num +