diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java new file mode 100644 index 000000000..1370fafe5 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java @@ -0,0 +1,28 @@ +package com.cool.store.dao; + +import com.cool.store.entity.AssessmentTemplateDO; +import com.cool.store.mapper.AssessmentTemplateMapper; +import com.google.common.collect.Lists; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:20 + * @Version 1.0 + */ +@Repository +public class AssessmentTemplateDAO { + @Resource + private AssessmentTemplateMapper assessmentTemplateMapper; + + public List listByType(@Param("type") Integer type){ + if (type == null){ + return Lists.newArrayList(); + } + return assessmentTemplateMapper.listByType(type); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java index 823df567a..bde96aa59 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java @@ -1,7 +1,20 @@ package com.cool.store.mapper; import com.cool.store.entity.AssessmentTemplateDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface AssessmentTemplateMapper extends Mapper { + + /** + * 根据类型查询 + * @param type + * @return + */ + List listByType(@Param("type") Integer type); + + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml index c65c0aab4..2f7d2e13a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml @@ -13,4 +13,9 @@ + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java index f7f240540..cf0d4e304 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java @@ -11,7 +11,7 @@ public class AssessmentTemplateDO { /** * 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - private Boolean type; + private Integer type; /** * 模板类别，可为空 @@ -60,7 +60,7 @@ public class AssessmentTemplateDO { * * @return type - 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - public Boolean getType() { + public Integer getType() { return type; } @@ -69,7 +69,7 @@ public class AssessmentTemplateDO { * * @param type 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - public void setType(Boolean type) { + public void setType(Integer type) { this.type = type; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java new file mode 100644 index 000000000..482502a8d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java @@ -0,0 +1,56 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:26 + * @Version 1.0 + */ +@Data +public class AssessmentTemplateVO { + + @ApiModelProperty("ID") + private Long id; + + /** + * 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 + */ + @ApiModelProperty("模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收") + private Integer type; + + /** + * 模板类别，可为空 + */ + @ApiModelProperty("分类") + private String category; + + /** + * 模板名称 + */ + @ApiModelProperty("模板名称") + private String templateName; + + /** + * 模板remark + */ + @ApiModelProperty("模板remark") + private List templateRemarkList; + + /** + * 考核项分值 + */ + @ApiModelProperty("考核项分值") + private Long score; + + /** + * 模板要求明细，包括详细的考核要求描述 + */ + @ApiModelProperty("模板要求明细，包括详细的考核要求描述") + private String templateRequirements; + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java new file mode 100644 index 000000000..4c81c4959 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java @@ -0,0 +1,25 @@ +package com.cool.store.service; + +import com.cool.store.vo.AssessmentTemplateVO; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:24 + * @Version 1.0 + */ +public interface AssessmentTemplateService { + + /** + * listByType + * @Description + * @Author suzhuhong + * @Date 2024/4/25 11:24 + * @param type + * @return + */ + List listByType(Integer type); + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java new file mode 100644 index 000000000..1cf96f4b6 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java @@ -0,0 +1,44 @@ +package com.cool.store.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +import com.cool.store.dao.AssessmentTemplateDAO; +import com.cool.store.entity.AssessmentTemplateDO; +import com.cool.store.service.AssessmentTemplateService; +import com.cool.store.utils.poi.StringUtils; +import com.cool.store.vo.AssessmentTemplateVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:25 + * @Version 1.0 + */ +@Service +public class AssessmentTemplateServiceImpl implements AssessmentTemplateService { + + @Resource + AssessmentTemplateDAO assessmentTemplateDAO; + + @Override + public List listByType(Integer type) { + List assessmentTemplateDOS = assessmentTemplateDAO.listByType(type); + List result = new ArrayList<>(); + assessmentTemplateDOS.forEach(x->{ + AssessmentTemplateVO assessmentTemplateVO = new AssessmentTemplateVO(); + BeanUtil.copyProperties(x,assessmentTemplateVO); + x.getTemplateRemark(); + if (StringUtils.isNotEmpty(x.getTemplateRemark())){ + String[] split = x.getTemplateRemark().replaceAll("[\\[\\]\\s]", "").split(","); + assessmentTemplateVO.setTemplateRemarkList(Arrays.asList(split)); + } + result.add(assessmentTemplateVO); + }); + return result; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index ea9654b9c..da6af8a75 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * @Version 1.0 */ @Service -public class PreparationServiceImpl implements PreparationService { +public class PreparationServiceImpl implements PreparationService { @Resource private ShopStageInfoDAO shopStageInfoDAO; @@ -38,8 +38,8 @@ public class PreparationServiceImpl implements PreparationService { List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); if (CollectionUtils.isNotEmpty(shopStageInfo)){ Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); - Boolean buildStoreCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatusName().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); - Boolean contractCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatusName().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()).getShopSubStageStatus()); + Boolean buildStoreCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); + Boolean contractCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 if (buildStoreCompletionFlag && contractCompletionFlag){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java new file mode 100644 index 000000000..71ff0a674 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java @@ -0,0 +1,39 @@ +package com.cool.store.controller.webb; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.AssessmentTemplateService; +import com.cool.store.vo.AssessmentTemplateVO; +import com.cool.store.vo.desk.IntendPendingVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:41 + * @Version 1.0 + */ +@Api(tags = "模板列表") +@RestController +@RequestMapping("pc/template") +public class AssessmentTemplateController { + + @Resource + AssessmentTemplateService assessmentTemplateService; + + @ApiOperation("检查项模板列表type 0 1 2 3") + @GetMapping("/listByType") + public ResponseResult> intendPendingList(@RequestParam(value = "type",required = true)Integer type) { + return ResponseResult.success(assessmentTemplateService.listByType(type)); + } + +}