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

coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java

@@ -2,6 +2,7 @@ package com.cool.store.dao;
 
 import com.cool.store.entity.AssessmentDataDO;
 import com.cool.store.mapper.AssessmentDataMapper;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
@@ -71,4 +72,11 @@ public class AssessmentDataDAO {
     public List<AssessmentDataDO> selectListByShopId(Long shopId) {
         return assessmentDataMapper.selectListByShopId(shopId);
     }
+    public Boolean deleteByShopId(Long shopId){
+        if (shopId == null){
+            return Boolean.FALSE;
+        }
+        assessmentDataMapper.deleteByShopId(shopId);
+       return Boolean.TRUE;
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java

@@ -11,4 +11,5 @@ public interface AssessmentDataMapper extends Mapper<AssessmentDataDO> {
     Integer batchUpdate(List<AssessmentDataDO> AssessmentDataDOS);
 
     List<AssessmentDataDO> selectListByShopId(@Param("shopId") Long shopId);
+    Boolean deleteByShopId(@Param("shopId") Long shopId);
 }

coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml

@@ -41,6 +41,9 @@
     </foreach>
     )
   </update>
+  <delete id="deleteByShopId">
+    DELETE FROM xfsg_assessment_data WHERE shop_id = #{shopId}
+  </delete>
   <select id="selectListByShopId" resultType="com.cool.store.entity.AssessmentDataDO">
     select *
     from xfsg_assessment_data

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

@@ -36,6 +36,7 @@
         u.region_id as regionId,
         u.role_id as roleId,
         u.shop_id as shopId,
+        u.register_time as registerTime,
         s.shop_name as shopName,
         e.id as employeeTrainingId,
         e.assessment_num as assessmentNum,
@@ -45,6 +46,7 @@
         e.practical_exam_status as practicalExamStatus,
         e.practical_exam_score as practicalExamScore,
         e.assessment_status as assessmentStatus
+
         from xfsg_temp_user_detail u
         left join xfsg_employee_training e on e.xfsg_user_detail_id = u.id
         left join xfsg_shop_info s on s.id = u.shop_id
@@ -68,10 +70,10 @@
             and e.assign_flag = #{assignFlag}
         </if>
         <if test="beginTime != null and beginTime != ''">
-            and e.register_time &gt;= #{beginTime}
+            and u.register_time &gt;= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and e.register_time &lt;= #{endTime}
+            and u.register_time &lt;= #{endTime}
         </if>
         <if test="shopIdList != null and shopIdList.size() > 0">
             and u.shop_id in

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java

@@ -23,7 +23,7 @@ public class AssessmentDataDTO {
     /**
      * 店铺是否合格
      */
-    @ApiModelProperty("店铺是否合格，0合格1不合格")
+    @ApiModelProperty("店铺是否合格，false不合格,true合格")
     private Boolean qualified;
     /**
      * 原因

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java

@@ -15,7 +15,7 @@ public class ThreeAcceptanceDTO {
     private String acceptanceSignatures;
     @ApiModelProperty("验收评语")
     private String comments;
-    @ApiModelProperty("0通过，1不通过")
+    @ApiModelProperty("1通过，0不通过")
     private Integer resultType;
     @ApiModelProperty("验收时间")
     private String acceptanceTime;

coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("提交加盟合同签约请求体")
 public class AddSignFranchiseRequest {
 
     @ApiModelProperty("主键，更新时才存在")

coolstore-partner-model/src/main/java/com/cool/store/request/AuditCheckRequest.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel("稽核请求")
 public class AuditCheckRequest {
 
     @ApiModelProperty("稽核id")

coolstore-partner-model/src/main/java/com/cool/store/request/AuditResultRequest.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel("审核结果请求体")
 public class AuditResultRequest {
 
     @ApiModelProperty("kdz业务id唯一标识")

coolstore-partner-model/src/main/java/com/cool/store/request/EmployeeTrainingDetailRequest.java

@@ -40,13 +40,6 @@ public class EmployeeTrainingDetailRequest {
     private String trainingTeacherUserId;
 
 
-    /**
-     * 实操考核人员ID
-     */
-    @ApiModelProperty("实操考核人员ID")
-    private String practicalAssessmentUserId;
-
-
     /**
      * 预计考核时间
      */

coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("加盟费/保证金实体")
 public class FranchiseFeeRequest {
 
     private Long id;

coolstore-partner-model/src/main/java/com/cool/store/request/IntentAgreementSubmitRequest.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel("提交意向签署协议Request")
 public class IntentAgreementSubmitRequest {
 
     private String partnerId;

coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 @Data
-@ApiModel("加盟意向Request")
 public class JoinIntentionRequest {
     private Long id;
     @ApiModelProperty("线索信息表-线索id")

coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("证照审批列表请求体")
 public class LicenseListRequest extends PageBasicInfo {
 
     @ApiModelProperty("门店名称")

coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java

@@ -9,7 +9,6 @@ import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
-@ApiModel("缴纳意向金Request")
 public class LinePaySubmitRequest {
 
     @ApiModelProperty("xfsg_user_info.partner_id")

coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("提交证照办理请求体")
 public class SubmitLicenseRequest {
 
     @ApiModelProperty("主键id")

coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("系统建店申请")
 public class SysStoreAppRequest {
 
     @ApiModelProperty("主键id")
@@ -28,7 +27,6 @@ public class SysStoreAppRequest {
 
 
     @Data
-    @ApiModel("加盟商信息")
     public static class FranInfo {
         @ApiModelProperty("加盟商类型" +
                 "0-新加盟商开单店;1-老加盟商开单店;" +
@@ -49,7 +47,6 @@ public class SysStoreAppRequest {
     }
 
     @Data
-    @ApiModel("门店信息")
     public static class StoreDetail{
         @ApiModelProperty("门店性质 20：加盟 10：直营")
         private Integer storeNature;
@@ -121,7 +118,6 @@ public class SysStoreAppRequest {
     }
 
     @Data
-    @ApiModel("督导相关信息")
     public static class SupervisorDetail{
 
         @ApiModelProperty("督导姓名")

coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("提交加盟合同签约请求体")
 public class AddSignFranchiseResponse {
 
     @ApiModelProperty("主键，更新时才存在")

coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java

@@ -45,7 +45,7 @@ public class CheckListResponse {
     @ApiModelProperty("招商经理id")
     private String investmentId;
 
-    @ApiModelProperty("招商经理id")
+    @ApiModelProperty("招商经理姓名")
     private String investmentName;
 
     @ApiModelProperty("稽核人")

coolstore-partner-model/src/main/java/com/cool/store/response/LicenseApiResponse.java

@@ -7,7 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@ApiModel("证照信息回调响应体")
+
 @Data
 @Builder
 @NoArgsConstructor

coolstore-partner-model/src/main/java/com/cool/store/response/LicenseListResponse.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@ApiModel("证照审批列表响应体")
 public class LicenseListResponse {
 
     private String shopId;

coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java

@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Objects;
 
 @Data
-@ApiModel("提交证照办理响应体")
 public class SubmitLicenseResponse {
 
     @ApiModelProperty("主键id")

coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java

@@ -42,7 +42,6 @@ public class SysStoreAppResponse {
     }
 
     @Data
-    @ApiModel("加盟商信息")
     public static class FranInfo {
 
         @ApiModelProperty("加盟商姓名")
@@ -88,7 +87,6 @@ public class SysStoreAppResponse {
     }
 
     @Data
-    @ApiModel("门店信息")
     public static class StoreDetail {
         @ApiModelProperty("门店性质")
         private Integer storeNature;
@@ -167,7 +165,6 @@ public class SysStoreAppResponse {
     }
 
     @Data
-    @ApiModel("督导相关信息")
     public static class SupervisorDetail {
 
         @ApiModelProperty("督导姓名")

coolstore-partner-model/src/main/java/com/cool/store/response/ThreeAcceptanceResponse.java

@@ -1,31 +0,0 @@
-package com.cool.store.response;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Auther: WangShuo
- * @Date: 2024/04/29/下午11:51
- * @Version 1.0
- * @注释:
- */
-@Data
-public class ThreeAcceptanceResponse {
-
-    @ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
-    private String engineeringAcceptanceSignatures;
-    @ApiModelProperty("营运部验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
-    private String operationsAcceptanceSignatures;
-    @ApiModelProperty("加密商验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
-    private String partnerAcceptanceSignatures;
-    @ApiModelProperty("验收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date acceptanceTime;
-    @ApiModelProperty("验收结果")
-    private Byte resultType;
-    @ApiModelProperty("验收评语")
-    private String acceptanceComments;
-}

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

@@ -104,6 +104,10 @@ public class AssessmentUserTrainingVO {
     private Integer assessmentStatus;
 
 
+    @ApiModelProperty("所属区域")
+    private String regionNodeName;
+
+
     @ApiModelProperty("考核数据")
     List<AssessmentTemplateDataVO> templateDataList;
 

coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java

@@ -30,7 +30,7 @@ public class EmployeeTrainingDetailVO {
     private Long regionId;
 
     @ApiModelProperty("角色id  170000000-店长 180000000-店员")
-    private String roleId;
+    private Long roleId;
 
     @ApiModelProperty("店铺id")
     private Long shopId;
@@ -42,15 +42,9 @@ public class EmployeeTrainingDetailVO {
     private Long employeeTrainingId;
 
 
-    @ApiModelProperty("战区名称")
-    private String regionName;
-
-    @ApiModelProperty("大区ID")
-    private Long largeRegionId;
-
-    @ApiModelProperty("大区名称")
-    private String largeRegionName;
 
+    @ApiModelProperty("所属区域")
+    private String regionNodeName;
     /**
      * 实训开始时间
      */

coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java

@@ -35,7 +35,7 @@ public class EmployeeTrainingVO {
     private Long shopId;
 
     @ApiModelProperty("店铺名称")
-    private Long shopName;
+    private String shopName;
 
     @ApiModelProperty("培训id")
     private Long employeeTrainingId;
@@ -61,14 +61,9 @@ public class EmployeeTrainingVO {
     @ApiModelProperty("考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过")
     private Integer assessmentStatus;
 
-    @ApiModelProperty("战区名称")
-    private String regionName;
 
-    @ApiModelProperty("大区ID")
+    @ApiModelProperty("所属区域")
-    private Long largeRegionId;
+    private String regionNodeName;
-
-    @ApiModelProperty("大区名称")
-    private String largeRegionName;
     /**
      * 实训结束时间
      */
@@ -119,4 +114,7 @@ public class EmployeeTrainingVO {
      */
     @ApiModelProperty("实际考核时间")
     private Date actualAssessmentTime;
+
+    @ApiModelProperty("登记时间")
+    private Date registerTime;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeUserTrainingVO.java

@@ -78,6 +78,9 @@ public class EmployeeUserTrainingVO {
     @ApiModelProperty("带教老师名称")
     private String trainingTeacherUserName;
 
+    @ApiModelProperty("所属区域")
+    private String regionNodeName;
+
 
     @ApiModelProperty("培训数据")
     List<AssessmentTemplateDataVO> templateDataList;

coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java

@@ -36,14 +36,9 @@ public class OpenAcceptanceInfoListVO {
     @ApiModelProperty("战区Id")
     private Long regionId;
 
-    @ApiModelProperty("战区名称")
+    @ApiModelProperty("所属区域")
-    private String regionName;
+    private String regionNodeName;
 
-    @ApiModelProperty("大区ID")
-    private Long largeRegionId;
-
-    @ApiModelProperty("大区名称")
-    private String largeRegionName;
     @ApiModelProperty("计划开业时间")
     private Date planOpenTime;
     @ApiModelProperty("新店开业结束时间")

coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java

@@ -9,7 +9,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.vo.Fitment.DecorationStageVO;
 import com.cool.store.vo.Fitment.DecorationModelVO;
@@ -113,7 +113,7 @@ public interface DecorationService {
      * @Date: 2024/5/6
      * @description:查看三方验收签字
      */
-    List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId);
+    ThreeSignResponse getThreeAcceptanceSign(Long shopId);
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3

coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java

@@ -153,7 +153,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
         checkListResponses.forEach(x -> {
             x.setIntervieweeName(intervieweeIdMap.get(x.getIntervieweeId()));
             x.setWantRegionName(wantShopAreaMap.get(x.getWantRegion()));
-            x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId()));
+            x.setInvestmentName(investmentIdMap.get(x.getInvestmentId()));
         });
 
         PageInfo<CheckListResponse> pageInfo = new PageInfo<>(checkListResponses);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java

@@ -21,7 +21,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.*;
 import com.cool.store.utils.poi.StringUtils;
@@ -412,6 +412,11 @@ public class DecorationServiceImpl implements DecorationService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) {
         log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request));
+        Boolean flag = assessmentDataDAO.deleteByShopId(request.getShopId());
+        if (Boolean.FALSE.equals(flag)){
+            log.error("三方验收插入检查项失败");
+            throw new ServiceException(ErrorCodeEnum.CHECK_ITEM);
+        }
         List<AssessmentDataDO> assessmentDataDOS = new ArrayList<>();
         for (AssessmentDataDTO assessmentDataDTO : request.getAssessmentDataDTOS()) {
             AssessmentDataDO assessmentDataDO = new AssessmentDataDO();
@@ -446,25 +451,33 @@ public class DecorationServiceImpl implements DecorationService {
     public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
         try {
             //工程部验收签名
-            JSONObject engineering = new JSONObject();
+            if (Objects.nonNull(request.getEngineeringAcceptance())) {
-            engineering.put("pic", request.getEngineeringAcceptance().getAcceptanceSignatures());
+                JSONObject engineering = new JSONObject();
-            engineering.put("acceptanceTime", new Date());
+                engineering.put("pic", request.getEngineeringAcceptance().getAcceptanceSignatures());
-            engineering.put("result", request.getEngineeringAcceptance().getResultType());
+                engineering.put("acceptanceTime", new Date());
-            engineering.put("remark", request.getEngineeringAcceptance().getComments());
+                engineering.put("result", request.getEngineeringAcceptance().getResultType());
-            engineering.put("status", 1);
+                engineering.put("remark", request.getEngineeringAcceptance().getComments());
+                engineering.put("status", 1);
+                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
+                acceptanceInfoDO.setShopId(request.getShopId());
+                acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString());
+                acceptanceInfoDO.setUpdateTime(new Date());
+                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
+            }
             //加盟商
-            JSONObject partner = new JSONObject();
+            if (Objects.nonNull(request.getPartnerAcceptance())) {
-            partner.put("pic", request.getPartnerAcceptance().getAcceptanceSignatures());
+                JSONObject partner = new JSONObject();
-            partner.put("acceptanceTime", new Date());
+                partner.put("pic", request.getPartnerAcceptance().getAcceptanceSignatures());
-            partner.put("result", request.getPartnerAcceptance().getResultType());
+                partner.put("acceptanceTime", new Date());
-            partner.put("remark", request.getPartnerAcceptance().getComments());
+                partner.put("result", request.getPartnerAcceptance().getResultType());
-            partner.put("status", 1);
+                partner.put("remark", request.getPartnerAcceptance().getComments());
-            AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
+                partner.put("status", 1);
-            acceptanceInfoDO.setShopId(request.getShopId());
+                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
-            acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString());
+                acceptanceInfoDO.setShopId(request.getShopId());
-            acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString());
+                acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString());
-            acceptanceInfoDO.setUpdateTime(new Date());
+                acceptanceInfoDO.setUpdateTime(new Date());
-            acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
+                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
+            }
             //更新阶段状态验收中
             shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122);
             return Boolean.TRUE;
@@ -623,10 +636,13 @@ public class DecorationServiceImpl implements DecorationService {
     }
 
     @Override
-    public List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId) {
+    public ThreeSignResponse getThreeAcceptanceSign(Long shopId) {
-        List<ThreeAcceptanceDTO> threeAcceptanceDTOS = new ArrayList<>();
 
+        ThreeSignResponse threeSignResponse = new ThreeSignResponse();
         AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
+        if (Objects.isNull(acceptanceInfoDO)){
+            return threeSignResponse;
+        }
         //工程部
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getEngineeringAcceptanceSignatures())) {
             JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO.getEngineeringAcceptanceSignatures());
@@ -635,7 +651,7 @@ public class DecorationServiceImpl implements DecorationService {
             engineeringDTO.setComments(engineering.getString("remark"));
             engineeringDTO.setResultType(engineering.getInteger("result"));
             engineeringDTO.setAcceptanceTime(engineering.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.ZERO, engineeringDTO);
+            threeSignResponse.setEngineeringAcceptance(engineeringDTO);
         }
         //营运部
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getOperationsAcceptanceSignatures())) {
@@ -645,7 +661,7 @@ public class DecorationServiceImpl implements DecorationService {
             operationsDTO.setComments(operations.getString("remark"));
             operationsDTO.setResultType(operations.getInteger("result"));
             operationsDTO.setAcceptanceTime(operations.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.ONE, operationsDTO);
+            threeSignResponse.setOperationsAcceptance(operationsDTO);
         }
         //加盟商
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getPartnerAcceptanceSignatures())) {
@@ -655,9 +671,9 @@ public class DecorationServiceImpl implements DecorationService {
             partnerDTO.setComments(partner.getString("remark"));
             partnerDTO.setResultType(partner.getInteger("result"));
             partnerDTO.setAcceptanceTime(partner.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.TWO, partnerDTO);
+            threeSignResponse.setPartnerAcceptance(partnerDTO);
         }
-        return threeAcceptanceDTOS;
+        return threeSignResponse;
     }
 
     @Override
@@ -672,7 +688,6 @@ public class DecorationServiceImpl implements DecorationService {
     }
 
 
-
     private DecorationDTO getDecorationDTO(Long shopId) {
         List<Long> shopIds = new ArrayList<>();
         shopIds.add(shopId);

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

@@ -75,14 +75,16 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
                 DateUtils.parseLongDateToStr(request.getBeginTime()),
                 DateUtils.parseLongDateToStr(request.getEndTime()), null,
                 request.getTheoreticalExamStatus(), request.getPracticalExamStatus(), request.getAssessmentStatus());
+        if (CollectionUtils.isEmpty(list)) {
+            return new PageInfo<>(list);
+        }
+
+        List<Long> regionIds = list.stream().map(EmployeeTrainingVO::getRegionId).distinct().collect(Collectors.toList());
+
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
 
         list.forEach(item -> {
-            Long regionId = item.getRegionId();
+            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-            Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(item.getRegionId());
-            Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, item.getRegionId()));
-            item.setRegionName(regionNameMap.get(item.getRegionId()));
-            item.setLargeRegionId(bigRegionIdByAreaId);
-            item.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
         });
         return new PageInfo<>(list);
     }
@@ -99,6 +101,8 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingVO.setTrainingStartTime(employeeTrainingDO.getTrainingStartTime());
         employeeTrainingVO.setTrainingEndTime(employeeTrainingDO.getTrainingEndTime());
         employeeTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
+        employeeTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
+        employeeTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
         StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
         if (storeDO != null) {
             employeeTrainingVO.setTrainingStoreName(storeDO.getStoreName());
@@ -120,11 +124,9 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingVO.setShopId(employeeTrainingDO.getShopId());
         ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(employeeTrainingDO.getShopId());
         employeeTrainingVO.setShopName(shopInfoDO.getShopName());
-        Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(employeeTrainingDO.getRegionId());
+
-        Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, employeeTrainingDO.getRegionId()));
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
-        employeeTrainingVO.setRegionName(regionNameMap.get(employeeTrainingDO.getRegionId()));
+        employeeTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
-        employeeTrainingVO.setLargeRegionId(bigRegionIdByAreaId);
-        employeeTrainingVO.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
         employeeTrainingVO.setRegionId(employeeTrainingDO.getRegionId());
         employeeTrainingVO.setMobile(tempUserDetailDO.getMobile());
         employeeTrainingVO.setUsername(tempUserDetailDO.getUsername());
@@ -142,7 +144,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(request.getId());
 
         if (employeeTrainingDO != null && employeeTrainingDO.getAssignFlag()) {
-            throw new ServiceException("已经分配");
+            throw new ServiceException("已经分配培训，无法再次分配");
         }
         if (employeeTrainingDO == null) {
             employeeTrainingDO = new EmployeeTrainingDO();
@@ -154,7 +156,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingDO.setTrainingStoreId(request.getTrainingStoreId());
         employeeTrainingDO.setTrainingStartTime(request.getTrainingStartTime());
         employeeTrainingDO.setTrainingEndTime(request.getTrainingEndTime());
-        employeeTrainingDO.setPracticalAssessmentUserId(request.getPracticalAssessmentUserId());
         employeeTrainingDO.setEstimatedAssessmentTime(request.getEstimatedAssessmentTime());
         employeeTrainingDO.setAssessmentNum(0);
         employeeTrainingDO.setAssessmentTotalNum(assessmentTemplateDOList.size());
@@ -185,11 +186,20 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
     public List<EmployeeTrainingVO> trainingListByShopId(Long shopId) {
 
         List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(shopId, null, null);
+        if (CollectionUtils.isEmpty(list)) {
+            return list;
+        }
+        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
+        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+
+        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+
         list.forEach(item -> {
-            StoreDO storeDO = storeDAO.getByStoreId(item.getTrainingStoreId());
+            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            if (storeDO != null) {
+            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-                item.setTrainingStoreName(storeDO.getStoreName());
+
-            }
         });
         return list;
     }
@@ -197,11 +207,16 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
     @Override
     public List<EmployeeTrainingVO> trainerUserList(String userId, Integer status) {
         List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(null, userId, status);
+        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
+        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+
+        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+
         list.forEach(item -> {
-            StoreDO storeDO = storeDAO.getByStoreId(item.getTrainingStoreId());
+            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            if (storeDO != null) {
+            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-                item.setTrainingStoreName(storeDO.getStoreName());
-            }
         });
         return list;
     }
@@ -254,6 +269,8 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
             templateDataVOList.add(assessmentTemplateDataVO);
         });
         employeeUserTrainingVO.setTemplateDataList(templateDataVOList);
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
+        employeeUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
         return employeeUserTrainingVO;
     }
 
@@ -291,7 +308,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         });
         Integer num = assessmentDataDAO.selectCount(userId, shopId);
         employeeTrainingDO.setAssessmentNum(num);
-        if(num.equals(employeeTrainingDO.getAssessmentTotalNum())){
+        if (num.equals(employeeTrainingDO.getAssessmentTotalNum())) {
             employeeTrainingDO.setAssessmentStatus(1);
         }
         employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
@@ -312,8 +329,13 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         List<String> storeIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
         List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
         Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+
+        List<Long> regionIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+
         employeeTrainingVOList.forEach(item -> {
             item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
+            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
         });
         return new PageInfo<>(employeeTrainingVOList);
     }
@@ -351,6 +373,9 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
             assessmentUserTrainingVO.setShopName(shopInfoDO.getShopName());
         }
 
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
+        assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
+
         List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.STORE_MANAGER.getCode());
 
         List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
@@ -441,10 +466,10 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         }
         employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
         employeeTrainingDO.setActualAssessmentTime(new Date());
-        if(employeeTrainingDO.getPracticalExamStatus() == 2 || employeeTrainingDO.getTheoreticalExamStatus() == 2){
+        if (employeeTrainingDO.getPracticalExamStatus() == 2 || employeeTrainingDO.getTheoreticalExamStatus() == 2) {
             employeeTrainingDO.setAssessmentStatus(3);
         }
-        if(employeeTrainingDO.getPracticalExamStatus() == 1 && employeeTrainingDO.getTheoreticalExamStatus() == 1){
+        if (employeeTrainingDO.getPracticalExamStatus() == 1 && employeeTrainingDO.getTheoreticalExamStatus() == 1) {
             employeeTrainingDO.setAssessmentStatus(2);
         }
         employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.cool.store.service.OpenAcceptanceInfoService;
 import com.cool.store.service.RegionService;
 import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.poi.DateUtils;
+import com.cool.store.vo.EmployeeTrainingVO;
 import com.cool.store.vo.OpenAcceptanceInfoListVO;
 import com.cool.store.vo.ShopAcceptanceVO;
 import com.cool.store.vo.ShopStageAcceptanceVO;
@@ -28,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author byd
@@ -64,6 +66,10 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService
             userIdList.add(vo.getAcceptanceUserId());
             userIdList.add(vo.getInvestmentManager());
         }
+
+        List<Long> regionIds = resultList.stream().map(OpenAcceptanceInfoListVO::getRegionId).distinct().collect(Collectors.toList());
+
+        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
         if (CollectionUtils.isNotEmpty(userIdList)) {
             Map<String, String> userNameMap = userDAO.getUserNameMap(userIdList);
             for (OpenAcceptanceInfoListVO vo : resultList) {
@@ -71,16 +77,12 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService
                 vo.setShopManagerUserName(userNameMap.get(vo.getShopManagerUserId()));
                 vo.setAcceptanceUserName(userNameMap.get(vo.getAcceptanceUserId()));
                 vo.setInvestmentManagerName(userNameMap.get(vo.getInvestmentManager()));
-                if(vo.getPlanOpenTime() != null){
+                if (vo.getPlanOpenTime() != null) {
                     vo.setPlanOpenEndTime(DateUtils.addDays(vo.getPlanOpenTime(), CommonConstants.THREE));
                 }
                 if (vo.getRegionId() != null) {
-                    Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(vo.getRegionId());
-                    Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, vo.getRegionId()));
                     vo.setRegionId(vo.getRegionId());
-                    vo.setRegionName(regionNameMap.get(vo.getRegionId()));
+                    vo.setRegionNodeName(regionNameMap.get(vo.getRegionId()));
-                    vo.setLargeRegionId(bigRegionIdByAreaId);
-                    vo.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
                 }
             }
         }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java

@@ -8,7 +8,6 @@ import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ResponseResult;
-import com.cool.store.response.ThreeAcceptanceResponse;
 import com.cool.store.service.DecorationService;
 import com.cool.store.vo.Fitment.DecorationModelVO;
 import com.cool.store.vo.Fitment.DesignInfoVo;

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java

@@ -9,7 +9,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ResponseResult;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.AssessmentTemplateService;
 import com.cool.store.service.DecorationService;
@@ -101,7 +101,7 @@ public class MiniDecorationController {
     }
     @ApiOperation("查看三方验收签字")
     @GetMapping("/getThreeSign")
-    public ResponseResult<List<ThreeAcceptanceDTO> > getThreeAcceptance(@RequestParam Long shopId){
+    public ResponseResult<ThreeSignResponse> getThreeAcceptance(@RequestParam Long shopId){
         return ResponseResult.success(decorationService.getThreeAcceptanceSign(shopId));
     }
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java

@@ -8,10 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-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;
@@ -29,7 +26,7 @@ public class MiniEmployeeTrainingController {
     private EmployeeTrainingService employeeTrainingService;
 
     @ApiOperation("培训员工列表")
-    @PostMapping("/trainingListByShopId")
+    @GetMapping("/trainingListByShopId")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
     })

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @Version 1.0
  */
 @RestController
-@RequestMapping("/mini//newStoreOpening")
+@RequestMapping("/mini/newStoreOpening")
 @Api(tags = "mini新店开业")
 public class MiniNewStoreOpeningController {
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
-@Api(tags = "pc加盟合同签约")
+@Api(tags = "Mini加盟合同签约")
 @RestController
 @RequestMapping("/mini/signFranchise")
 public class MiniSignFranchiseController {

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java

@@ -62,15 +62,4 @@ public class TempUserDetailController {
     public ResponseResult<TempUserDetailInfoVO> getUserInfoByIdUserDetailId(@RequestParam(value = "userDetailId") Long userDetailId) {
         return ResponseResult.success(tempUserDetailService.getUserInfoByIdUserDetailId((userDetailId)));
     }
-
-    @PostMapping(path = "/registrationCompleted")
-    @ApiOperation("培训登记-完成")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "店铺id shopId")
-    })
-    public ResponseResult<Boolean> registrationCompleted(@RequestBody IdRequest idRequest) {
-        tempUserDetailService.registrationCompleted((idRequest.getId()));
-        return ResponseResult.success(Boolean.TRUE);
-    }
-
 }