From 20110345c60694d5ef2d576b0c5f29187145b5e2 Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 9 May 2024 18:23:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CoolStoreStartFlowServiceImpl.java | 2 +- .../impl/SignFranchiseServiceImpl.java | 37 ++++++++++--------- .../store/utils/poi/constant/Constants.java | 7 ++++ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java index 565be14eb..59431740d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java @@ -71,7 +71,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService String url = null; if (Constants.ONE_INTEGER == type) { url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_COMPANY + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); - } else if (Constants.ZERO_INTEGER == type) { + } else if (Constants.TWO_INTEGER == type) { url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_PERSON + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); } InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, request, InitiatingResponse.class); 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 38f327fbf..35b9608dc 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 @@ -27,10 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.text.SimpleDateFormat; +import java.util.*; @Service @Slf4j @@ -174,14 +172,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu temp.add("object"); Convert.digitToChinese(123); FranchiseAgreementRequest buildResult = FranchiseAgreementRequest.builder() - .apply_user(user.getJobNumber()) +// .apply_user(user.getJobNumber()) + .apply_user("20230724") .company(0) - .start1(DateUtils.dateTime(franchiseFeeDO.getFirstYearStartTime())) - .start2(DateUtils.dateTime(franchiseFeeDO.getSecondYearStartTime())) - .start3(DateUtils.dateTime(franchiseFeeDO.getThirdYearStartTime())) - .end1(DateUtils.dateTime(franchiseFeeDO.getFirstYearEndTime())) - .end2(DateUtils.dateTime(franchiseFeeDO.getSecondYearEndTime())) - .end3(DateUtils.dateTime(franchiseFeeDO.getThirdYearEndTime())) + .start1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearStartTime())) + .start2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearStartTime())) + .start3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearStartTime())) + .end1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearEndTime())) + .end2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearEndTime())) + .end3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearEndTime())) .fjsc(temp) .fqgsmc("鲜丰水果股份有限公司") .fzzd1(0) @@ -201,7 +200,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .is_business_license(request.getIsBusinessLicense()) .is_deposit(1) .is_food_license(request.getIsFoodLicense()) - .jiaokuandate(DateUtils.dateTime(linePayDO.getPayTime())) + .jiaokuandate(getDateTimeFormat(Constants.TIME_STAMP_FLAG,linePayDO.getPayTime())) .jkr(linePayDO.getPayUserName()) .jmd_area(pointInfoDO.getDistrict()) .jmd_city(pointInfoDO.getCity()) @@ -239,7 +238,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .jmssfzhm(signingBaseInfoDO.getIdCardNo()) .jmsxm(lineInfoDO.getPartnerNum()) .jmsxm1(lineInfoDO.getUsername()) - .jsrq(DateUtils.dateTime(request.getContractStartEndTime())) + .jsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartEndTime())) .jszhhz(linePayDO.getPayAccount()) .kdzBusinessId(AuditEnum.SIGN_FRANCHISE + "_" + shopId + "_" + lineId) .khhjzh(linePayDO.getBankName()) @@ -256,7 +255,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .ppsyfbl(Double.valueOf(request.getBrandFee())) .psfl("以实际结算为准") .qsdz("PUBLIC_COMPANY") - .qsrq(DateUtils.dateTime(request.getContractStartTime())) + .qsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartTime())) .qylx(SignTypeEnum.getWorkflowStageByCode(request.getSignType()).getCode()) .qys_dzyz("2731707107593166911") .qys_htywfl("3051420203180101971") @@ -264,12 +263,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .remark(request.getRemark()) .remark2(systemBuildingShopDO.getReasons()) .sfbq__add(request.getResign()) - .sj1(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessStartHours())) - .sj2(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessEndHours())) + .sj1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessStartHours())) + .sj2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessEndHours())) .social_credit_code(licenseTransactDO.getCreditCode()) .spltxkz(temp) .sqr_name(user.getName()) - .sqrq(DateUtils.getDate()) + .sqrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,new Date())) .title("特许经营合同审批申请2023-" + lineInfoDO.getUsername() + "-" + DateUtils.getDate()) .wlyzbm("201905081151092R") .yycs(Integer.valueOf(request.getImpressionNum())) @@ -398,4 +397,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } return addSignFranchiseResponse; } + + public static String getDateTimeFormat(String pattern,Date date) { + return new SimpleDateFormat(pattern).format(date); + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java index 99cd31c81..847fbb3ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java @@ -193,12 +193,19 @@ public class Constants public static final Integer ONE_INTEGER = 1; + + public static final Integer TWO_INTEGER = 2; + public static final String INSERT_FLAG = "insert"; public static final String UPDATE_FLAG = "update"; public static final String TIME_STAMP_FLAG = "yyyy-MM-dd"; + public static final String TIME_STAMP_FLAG_TWO = "yyyyMMdd"; + + public static final String TIME_STAMP_FLAG_THREE = "HH:mm"; + public static final String GET_PROJECT_LIST = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectByCustomLable&remark=%s"; public static final String GET_PROJECT_DETAIL= "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails"; From 481c555b4e49b80ff199f85d789101f22758d85f Mon Sep 17 00:00:00 2001 From: bianyadong Date: Thu, 9 May 2024 19:06:01 +0800 Subject: [PATCH 2/4] sql fix --- .../java/com/cool/store/dao/ShopStageInfoDAO.java | 1 + .../resources/mapper/EmployeeTrainingMapper.xml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index f21ffe11c..d94548852 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -65,6 +65,7 @@ public class ShopStageInfoDAO { addShopStageList.add(shopStageInfo); } } + //发送短信 return shopStageInfoMapper.batchInsert(addShopStageList); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml index eb56ee1f6..3c859a445 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml @@ -54,7 +54,7 @@ e.training_store_id as trainingStoreId, e.estimated_assessment_time as estimatedAssessmentTime, e.actual_assessment_time as actualAssessmentTime, - e.assign_flag as assignFlag + ifnull(e.assign_flag,0) as assignFlag 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 @@ -74,9 +74,12 @@ #{item} - + and e.assign_flag = #{assignFlag} + + and e.assign_flag is null + and u.register_time >= #{beginTime} @@ -101,8 +104,11 @@ and e.assessment_total_num = e.assessment_num - - and s.store_num not null + + and s.store_num is not null + + + and s.store_num is null - select - from xfsg_acceptance_info a - left join join xfsg_shop_stage_info b on a.shop_id = b.shop_id - where b.shop_sub_stage_status = #{status} and a.deleted = 0 - + create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user + + + update xfsg_acceptance_info + + + actual_entry_time = #{actualEntryTime} , + + + planned_completion_time = #{plannedCompletionTime} , + + + planned_start_time = #{plannedStartTime} , + + + decoration_planned_completion_time = #{decorationPlannedCompletionTime} , + + + decoration_planned_start_time = #{decorationPlannedStartTime} , + + + construction_completion_time = #{constructionCompletionTime} , + + + engineering_acceptance_signatures = #{engineeringAcceptanceSignatures} , + + + operations_acceptance_signatures = #{operationsAcceptanceSignatures} , + + + partner_acceptance_signatures = #{partnerAcceptanceSignatures} , + + + update_time = #{updateTime} , + + + deleted = #{deleted} , + + + plan_acceptance_time =#{planAcceptanceTime}, + + + actual_acceptance_time =#{actualAcceptanceTime}, + + + booking_user =#{bookingUser}, + + + where shop_id = #{shopId} + + diff --git a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml index 1789cfcef..cc3ce8c53 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml @@ -52,27 +52,29 @@ , comments=values(comments), picture=values(picture), video=values(video) - update xfsg_assessment_data - - qualified = CASE id - - WHEN #{item.id} THEN #{item.qualified} - , - reason = CASE id - - WHEN #{item.id} THEN #{item.reason} - , - comments = CASE id - - WHEN #{item.id} THEN #{item.comments} + update xfsg_assessment_data + + qualified = CASE id + + WHEN #{item.id} THEN #{item.qualified} + + END, + reason = CASE id + + WHEN #{item.id} THEN #{item.reason} + + END, + comments = CASE id + + WHEN #{item.id} THEN #{item.comments} + + END + + where id in ( + + #{item.id} - END - - where id in ( - - #{item.id} - - ) + ) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 4ce92a5ee..1d31f9606 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -252,4 +252,18 @@ + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java index bf56cc721..687352320 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java @@ -1,7 +1,4 @@ package com.cool.store.entity; - -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import java.util.Date; import javax.persistence.*; @@ -56,14 +53,12 @@ public class AcceptanceInfoDO { /** * 工程部验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":1} */ - @Column(name = "engineering_acceptance_signatures") private String engineeringAcceptanceSignatures; /** * 营运部验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":1} */ - @Column(name = "operations_acceptance_signatures") private String operationsAcceptanceSignatures; /** @@ -88,6 +83,43 @@ public class AcceptanceInfoDO { * 是否删除：0.否 1.是 */ private Boolean deleted; + /** + * 计划验收时间 + */ + private Date planAcceptanceTime; + + /** + * 实际验收时间 + */ + private Date actualAcceptanceTime; + /** + * 预约人 + */ + private String bookingUser; + + public Date getPlanAcceptanceTime() { + return planAcceptanceTime; + } + + public void setPlanAcceptanceTime(Date planAcceptanceTime) { + this.planAcceptanceTime = planAcceptanceTime; + } + + public Date getActualAcceptanceTime() { + return actualAcceptanceTime; + } + + public void setActualAcceptanceTime(Date actualAcceptanceTime) { + this.actualAcceptanceTime = actualAcceptanceTime; + } + + public String getBookingUser() { + return bookingUser; + } + + public void setBookingUser(String bookingUser) { + this.bookingUser = bookingUser; + } /** * @return id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java new file mode 100644 index 000000000..a80668a0b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java @@ -0,0 +1,20 @@ +package com.cool.store.request; + +import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @Auther: WangShuo + * @Date: 2024/05/09/下午5:27 + * @Version 1.0 + * @注释: + */ +@Data +public class AcceptanceListRequest { + + private List subStageStatus; + private Integer pageNum; + private Integer pageSize; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java index d31a87794..5e9aa97ca 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java @@ -15,7 +15,6 @@ import java.util.Date; @Data public class BookingAcceptanceRequest { private Long shopId; - @ApiModelProperty("预约验收实际") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("预约验收时间") private Date bookingAcceptanceTime; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java index 4d7ce89b7..2b5309e5e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java @@ -4,10 +4,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.dto.decoration.ThreeAcceptanceDTO; -import com.cool.store.request.LinePaySubmitRequest; -import com.cool.store.request.ThreeAcceptanceCheckRequest; -import com.cool.store.request.ThreeAcceptanceRequest; -import com.cool.store.request.BookingAcceptanceRequest; +import com.cool.store.request.*; import com.cool.store.response.FitmentResponse; import com.cool.store.response.ThreeSignResponse; @@ -107,13 +104,13 @@ public interface DecorationService { * @Date: 2024/5/3 * @description:预约验收 */ - Boolean bookingAcceptance(BookingAcceptanceRequest response); + Boolean bookingAcceptance(BookingAcceptanceRequest response,LoginUserInfo user); /** * @Auther: wangshuo * @Date: 2024/5/3 * @description:获取验收列表 */ - PageInfo getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user,Integer pageNum,Integer pageSize); + PageInfo getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 543f921e0..256259df6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -17,10 +17,7 @@ import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.ShopInfoMapper; -import com.cool.store.request.LinePaySubmitRequest; -import com.cool.store.request.ThreeAcceptanceCheckRequest; -import com.cool.store.request.ThreeAcceptanceRequest; -import com.cool.store.request.BookingAcceptanceRequest; +import com.cool.store.request.*; import com.cool.store.response.FitmentResponse; import com.cool.store.response.ThreeSignResponse; @@ -403,31 +400,35 @@ public class DecorationServiceImpl implements DecorationService { @Override public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) { try { - //工程部验收签名 - if (Objects.nonNull(request.getEngineeringAcceptance())) { - request.getEngineeringAcceptance().setAcceptanceTime(new Date()); - request.getEngineeringAcceptance().setStatus(CommonConstants.ONE); - String jsonString = JSONObject.toJSONString(request.getEngineeringAcceptance()); - AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); - acceptanceInfoDO.setShopId(request.getShopId()); - acceptanceInfoDO.setEngineeringAcceptanceSignatures(jsonString); - acceptanceInfoDO.setUpdateTime(new Date()); - acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_10); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_102.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { + //工程部验收签名 + if (Objects.nonNull(request.getEngineeringAcceptance())) { + request.getEngineeringAcceptance().setAcceptanceTime(new Date()); + request.getEngineeringAcceptance().setStatus(CommonConstants.ONE); + String jsonString = JSONObject.toJSONString(request.getEngineeringAcceptance()); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(request.getShopId()); + acceptanceInfoDO.setEngineeringAcceptanceSignatures(jsonString); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + } + //加盟商 + if (Objects.nonNull(request.getPartnerAcceptance())) { + request.getPartnerAcceptance().setStatus(CommonConstants.ONE); + request.getPartnerAcceptance().setAcceptanceTime(new Date()); + String jsonString = JSONObject.toJSONString(request.getPartnerAcceptance()); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(request.getShopId()); + acceptanceInfoDO.setPartnerAcceptanceSignatures(jsonString); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + } + //更新阶段状态验收中 + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); + return Boolean.TRUE; } - //加盟商 - if (Objects.nonNull(request.getPartnerAcceptance())) { - request.getPartnerAcceptance().setStatus(CommonConstants.ONE); - request.getPartnerAcceptance().setAcceptanceTime(new Date()); - String jsonString = JSONObject.toJSONString(request.getPartnerAcceptance()); - AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); - acceptanceInfoDO.setShopId(request.getShopId()); - acceptanceInfoDO.setPartnerAcceptanceSignatures(jsonString); - acceptanceInfoDO.setUpdateTime(new Date()); - acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); - } - //更新阶段状态验收中 - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); - return Boolean.TRUE; + return Boolean.FALSE; } catch (Exception e) { log.error("mini提交三方验收失败"); throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE); @@ -435,8 +436,7 @@ public class DecorationServiceImpl implements DecorationService { } @Override - public PageInfo getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user, Integer - pageNum, Integer pageSize) { + public PageInfo getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user) { List authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); List regions = new ArrayList<>(); for (String authRegionId : authRegionIds) { @@ -448,8 +448,8 @@ public class DecorationServiceImpl implements DecorationService { } List fitmentCheckVOList = new ArrayList<>(); //shopId,lineid,regionid,shopname,storenum, - PageHelper.startPage(pageNum, pageSize); - List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, subStageStatus); + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, request.getSubStageStatus()); PageInfo pageInfo = new PageInfo<>(shopInfoDOS); if (shopInfoDOS.isEmpty()) { log.info("该工程部监理下门店为空"); @@ -457,7 +457,8 @@ public class DecorationServiceImpl implements DecorationService { } Map ShopIdmap = shopInfoDOS.stream().collect(Collectors.toMap(ShopInfoDO::getId, dto1 -> dto1)); //招商经理，选址人员（拓展经理）id - List lineIds = shopInfoDOS.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList()); + List lineIds = shopInfoDOS.stream().filter(o->o.getLineId()!=null) + .map(ShopInfoDO::getLineId).distinct().collect(Collectors.toList()); List lineInfos = lineInfoMapper.getByLineIds(lineIds); Map lineInfoDOMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, dto -> dto)); //招商name @@ -479,43 +480,50 @@ public class DecorationServiceImpl implements DecorationService { String userName = enterpriseUserDAO.getUserName(fightMangerUserId); fightManger.put(regionId, userName); } - //施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间 - Map ShopStageInfoDOMap = new HashMap<>(); - for (Long shopId : ShopIdmap.keySet()) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12); - ShopStageInfoDOMap.put(shopId, shopSubStageInfo); - } + //施工计划完成时间 //施工实际完成实际//计划验收时间//验收实际时间 + List shopIds = new ArrayList<>(ShopIdmap.keySet()); + List acceptanceInfoDOS = acceptanceInfoDAO.selectByShopIds(shopIds); + Map acceptanceInfoDOSMap = acceptanceInfoDOS.stream() + .collect(Collectors.toMap(AcceptanceInfoDO::getShopId, dto1 -> dto1)); + //验收状态 + List subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage()); + Map ShopStageInfoDOMap = subStageList.stream() + .collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto1 -> dto1)); for (ShopInfoDO shopInfoDO : shopInfoDOS) { + Long shopId = shopInfoDO.getId(); + Long lineId = shopInfoDO.getLineId(); + Long regionId = shopInfoDO.getRegionId(); fitmentCheckVO fitmentCheckVO = new fitmentCheckVO(); - fitmentCheckVO.setShopId(shopInfoDO.getId()); + fitmentCheckVO.setShopId(shopId); + fitmentCheckVO.setLineId(lineId); fitmentCheckVO.setShopName(shopInfoDO.getShopName()); fitmentCheckVO.setStoreNum(shopInfoDO.getStoreNum()); - fitmentCheckVO.setLineId(shopInfoDO.getLineId()); - fitmentCheckVO.setRegionId(shopInfoDO.getRegionId()); - fitmentCheckVO.setRegion(regionNameMap.get(shopInfoDO.getRegionId())); - fitmentCheckVO.setFightManager(fightManger.get(shopInfoDO.getRegionId())); - if (shopInfoDO.getLineId() != null) { - fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(shopInfoDO.getLineId()) + fitmentCheckVO.setRegionId(regionId); + fitmentCheckVO.setRegion(regionNameMap.get(regionId)); + fitmentCheckVO.setFightManager(fightManger.get(regionId)); + if (lineId != null) { + fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(lineId) .getInvestmentManager()); - fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) + fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(lineId) .getInvestmentManager())); - fitmentCheckVO.setSitterId(lineInfoDOMap.get(shopInfoDO.getLineId()) + fitmentCheckVO.setSitterId(lineInfoDOMap.get(lineId) .getDevelopmentManager()); - fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) + fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(lineId) .getDevelopmentManager())); - fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername()); + fitmentCheckVO.setPartnerName(lineInfoDOMap.get(lineId).getUsername()); } - if (shopInfoDO.getId() != null) { - if (Objects.nonNull(ShopStageInfoDOMap.get(shopInfoDO.getId()))) { - Date PlanEndTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); - fitmentCheckVO.setPlanEndTime(PlanEndTime); - Date actualEndDate = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getActualCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); - fitmentCheckVO.setActualEndTime(actualEndDate); - Date PlanAcceptanceTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); - fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime); - fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus()); + AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDOSMap.get(shopId); + if (shopId != null) { + if (Objects.nonNull(acceptanceInfoDO)) { + fitmentCheckVO.setPlanEndTime(acceptanceInfoDO.getDecorationPlannedCompletionTime()); + fitmentCheckVO.setActualEndTime(acceptanceInfoDO.getConstructionCompletionTime()); + fitmentCheckVO.setPlanAcceptanceTime(acceptanceInfoDO.getPlanAcceptanceTime()); + fitmentCheckVO.setAcceptanceTime(acceptanceInfoDO.getActualAcceptanceTime()); } } + if (Objects.nonNull(ShopStageInfoDOMap.get(shopId))) { + fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopId).getShopSubStageStatus()); + } fitmentCheckVOList.add(fitmentCheckVO); } pageInfo.setList(fitmentCheckVOList); @@ -541,10 +549,11 @@ public class DecorationServiceImpl implements DecorationService { acceptanceInfoDO.setShopId(request.getShopId()); acceptanceInfoDO.setOperationsAcceptanceSignatures(jsonString); acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDO.setActualAcceptanceTime(new Date()); acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); - if (AuditResultTypeEnum.PASS.getCode() == request.getOperationsAcceptance().getResult() - && AuditResultTypeEnum.PASS.getCode() == partner.getResult() - && AuditResultTypeEnum.PASS.getCode() == engineering.getResult()) { + if (CommonConstants.ONE == request.getOperationsAcceptance().getResult() + && CommonConstants.ONE == partner.getResult() + && CommonConstants.ONE == engineering.getResult()) { //更新阶段状态验收完毕 shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123, null); preparationService.whetherToOpenForAcceptance(request.getShopId()); @@ -588,15 +597,20 @@ public class DecorationServiceImpl implements DecorationService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean bookingAcceptance(BookingAcceptanceRequest request) { - + public Boolean bookingAcceptance(BookingAcceptanceRequest request,LoginUserInfo user) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121); ShopStageInfoDO newShopStageInfoDO = new ShopStageInfoDO(); - CoolDateUtils.parseDate(request.getBookingAcceptanceTime().toString(), CoolDateUtils.DATE_FORMAT_SEC); - newShopStageInfoDO.setPlanCompleteTime(request.getBookingAcceptanceTime().toString()); + SimpleDateFormat sdf = new SimpleDateFormat(CoolDateUtils.DATE_FORMAT_SEC); + String date = sdf.format(request.getBookingAcceptanceTime()); + newShopStageInfoDO.setPlanCompleteTime(date); newShopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage()); newShopStageInfoDO.setShopId(request.getShopId()); shopStageInfoDAO.updateByShopId(newShopStageInfoDO); + AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(request.getShopId()); + acceptanceInfoDO.setBookingUser(user.getUserId()); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDO.setPlanAcceptanceTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); return Boolean.TRUE; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index c1db3658b..c1c021088 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.context.PartnerUserHolder; import com.cool.store.dto.decoration.ConstructionScheduleDTO; +import com.cool.store.request.AcceptanceListRequest; import com.cool.store.request.BookingAcceptanceRequest; import com.cool.store.request.ThreeAcceptanceCheckRequest; import com.cool.store.request.ThreeAcceptanceRequest; @@ -64,15 +65,16 @@ public class PCDecorationController { return ResponseResult.success(decorationService.getDecorationModel(shopId,null)); } @ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过") - @GetMapping("/getAcceptanceList") - public ResponseResult> getAcceptanceList(@RequestParam Integer subStageStatus, @RequestParam Integer pageNum,@RequestParam Integer pageSize){ + @PostMapping("/getAcceptanceList") + public ResponseResult> getAcceptanceList(@RequestBody AcceptanceListRequest request){ LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(decorationService.getFitmentAcceptanceList(subStageStatus,user,pageNum,pageSize)); + return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user)); } @ApiOperation("预约验收") @PostMapping("/bookingAcceptance") public ResponseResult submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){ - return ResponseResult.success(decorationService.bookingAcceptance(response)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(decorationService.bookingAcceptance(response,user)); } @ApiOperation("获取三方验收检查项") @GetMapping("/getAcceptanceChecks") From a8e3d0fdc9d768c4ee81cdbd2a9cd67507906e98 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 10 May 2024 09:58:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0firstorder=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/FirstOrderMapper.xml | 3 +-- .../cool/store/dto/openPreparation/FirstOrderDTO.java | 7 ++++++- .../cool/store/service/impl/FirstOrderServiceImp.java | 10 +++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml index ee9c59df6..f84cbaf23 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml @@ -17,8 +17,7 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java index 17c5b9f6d..be06c0050 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java @@ -32,7 +32,12 @@ public class FirstOrderDTO { @ApiModelProperty("创建人") private String createUserId; - + @ApiModelProperty("加盟商") + private String partnerName; + @ApiModelProperty("创建时间") + private Date createTime; + @ApiModelProperty("更新时间") + private Date updateTime; @ApiModelProperty("更新人") private String updateUserId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index fbe6c670f..2de20dc94 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.FirstOrderDAO; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.dto.openPreparation.FirstOrderDTO; @@ -50,7 +51,8 @@ public class FirstOrderServiceImp implements FirstOrderService { private ShopStageInfoDAO shopStageInfoDAO; @Resource private CoolStoreStartFlowService coolStoreStartFlowService; - + @Resource + private EnterpriseUserDAO enterpriseUserDAO; @Override public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) { log.info("save order:{}", JSONObject.toJSONString(request)); @@ -116,11 +118,17 @@ public class FirstOrderServiceImp implements FirstOrderService { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { + + String userName = enterpriseUserDAO.getUserName(order.getCreateUserId()); + order.setPartnerName(userName); order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); return order; } if (Objects.nonNull(order)) { try { + + String userName = enterpriseUserDAO.getUserName(order.getCreateUserId()); + order.setPartnerName(userName); ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); String storeNum = shopInfo.getStoreNum(); Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum);