suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-05-14 16:51:03 +08:00
parent e704aeca68 daefaf4397
commit 50e0e9eaf4
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
View File

@@ -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);
}
}

6
coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
View File

@@ -143,6 +143,12 @@
<if test="shopId != null">
and u.shop_id = #{shopId}
</if>
<if test="status != null and status == 0">
and e.assessment_total_num > e.assessment_num
</if>
<if test="status != null and status == 1">
and e.assessment_total_num = e.assessment_num
</if>
</select>
<select id="assessmentUserList" resultType="com.cool.store.vo.EmployeeTrainingVO">
select

12
coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
View File

@@ -106,6 +106,18 @@ public class AssessmentUserTrainingVO {
@ApiModelProperty("所属区域")
private String regionNodeName;
/**
* 考核项数
*/
@ApiModelProperty("考核项数")
private Integer assessmentNum;
/**
* 考核总项数
*/
@ApiModelProperty("考核总项数")
private Integer assessmentTotalNum;
@ApiModelProperty("考核数据")

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
View File

@@ -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());
@@ -567,6 +568,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) {
if (CollectionUtils.isEmpty(request.getList())) {

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -292,11 +292,11 @@ 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());
ShopAuditInfoDO shopAuditInfoDO = null;
if (Objects.nonNull(signFranchiseDO)) {
shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId());
}
if (Objects.nonNull(shopAuditInfoDO)) {
response.setStatus(shopAuditInfoDO.getResultType());
if (shopAuditInfoDO.getResultType() == 0) {