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

feat：校验

Browse Source
This commit is contained in:
苏竹红
2024-10-13 14:01:53 +08:00
parent 4d149210d5
commit 9ccf1c6753
5 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -221,6 +221,7 @@ public enum ErrorCodeEnum {
SEE_ACCEPTANCE_AUDIT_NULL(12005,"视觉验收结果为空",null),
STATUS_NOT_SUPPORT_SUMMIT(121006,"该状态不支持上传",null),
DESIGN_NO_COMPLETE(121007,"请先完成设计阶段！",null),
SIGN_COMPLETED(121008,"你已完成验收,无需重复操作！",null),
UPDATE_FAIL(131000,"修改失败，表单不存在！",null),
LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传！",null),

24
coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java
View File

@@ -1,6 +1,9 @@
package com.cool.store.utils;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import java.text.DateFormat;
import java.text.ParseException;
@@ -14,6 +17,7 @@ import java.util.Date;
* @Date 2023/6/8 17:17
* @Version 1.0
*/
@Slf4j
public class CoolDateUtils {
public static final String DATE_FORMAT_DAY = "yyyy-MM-dd";
@@ -21,6 +25,7 @@ public class CoolDateUtils {
public static final String TIME_FORMAT_SEC = "HH:mm:ss";
public static final String TIME_FORMAT_SEC2 = "HH:mm";
public static final String DATE_FORMAT_SEC = "yyyy-MM-dd HH:mm:ss";
public static final String DATE_FORMAT_SEC1 = "yyyy-MM-dd HH:mm";
public static final String DATE_FORMAT_SEC_2 = "yyyy/MM/dd HH:mm:ss";
public static final String DATE_FORMAT_SEC_3 = "yyyy.MM.dd HH:mm:ss";
public static final String DATE_FORMAT_SEC_4 = "yyyy.MM.dd HH:mm";
@@ -64,6 +69,25 @@ public class CoolDateUtils {
System.out.println("LocalDate: " + today);
}
/**
* 时间格式转换
* @param newFormat
* @param oldFormat
* @param data
* @return
*/
public static String parseStrToStr(String newFormat,String oldFormat,String data){
if (StringUtils.isEmpty(data)){
return null;
}
Date date = null;
try {
date = DateUtils.parseDate(data, oldFormat);
} catch (ParseException e) {
log.error("时间转换异常 {}",e);
}
return DateUtil.format(date,newFormat);
}
/**

16
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopStageInfoVO.java
View File

@@ -1,25 +1,30 @@
package com.cool.store.vo.shop;
import cn.hutool.core.date.DateUtil;
import com.cool.store.entity.LineAuditInfoDO;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.entity.ShopStageInfoDO;
import com.cool.store.enums.point.ShopStageEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.utils.CoolDateUtils;
import com.cool.store.vo.AuditInfoVO;
import com.cool.store.vo.LineAuditInfoVO;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.ParseException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @author zhangchenbiao
* @FileName: ShopStageInfoVO
@@ -27,6 +32,7 @@ import java.util.stream.Collectors;
* @date 2024-04-11 17:10
*/
@Data
@Slf4j
public class ShopStageInfoVO {
@ApiModelProperty("店铺阶段")
@@ -70,7 +76,7 @@ public class ShopStageInfoVO {
AuditInfoVO auditInfoVO = AuditInfoVO.convertVO(auditInfo);
shopStageInfo.setAuditInfo(auditInfoVO);
shopStageInfo.setPlanCompleteTime(stageInfo.getPlanCompleteTime());
shopStageInfo.setActualCompleteTime(stageInfo.getActualCompleteTime());
shopStageInfo.setActualCompleteTime(CoolDateUtils.parseStrToStr(CoolDateUtils.DATE_FORMAT_SEC,CoolDateUtils.DATE_FORMAT_SEC1,stageInfo.getActualCompleteTime()));
resultList.add(shopStageInfo);
}
return resultList;

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

@@ -295,6 +295,10 @@ public class DecorationServiceImpl implements DecorationService {
@Transactional(rollbackFor = Exception.class)
public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) {
log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request));
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_12);
if (shopSubStageInfo.getShopSubStageStatus()>ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121.getShopSubStageStatus()){
throw new ServiceException(ErrorCodeEnum.SIGN_COMPLETED);
}
List<AssessmentTemplateVO> assessmentTemplateVOS = assessmentTemplateService.listByType(AssessmentTemplateType.TRIPARTITE_ACCEPTANCE.getCode());
Long max = assessmentTemplateVOS.stream().mapToLong(AssessmentTemplateVO::getId).max().orElse(0L);
Long min = assessmentTemplateVOS.stream().mapToLong(AssessmentTemplateVO::getId).min().orElse(0L);
@@ -312,7 +316,6 @@ public class DecorationServiceImpl implements DecorationService {
}
if (CollectionUtils.isNotEmpty(assessmentDataDOList)) {
assessmentDataService.batchUpdate(assessmentDataDOS);
} else {
assessmentDataService.batchInsertSelective(assessmentDataDOS);
}

5
coolstore-partner-service/src/main/java/com/cool/store/utils/poi/DateUtils.java
View File

@@ -1,5 +1,8 @@
package com.cool.store.utils.poi;
import cn.hutool.core.date.DateUtil;
import com.cool.store.utils.CoolDateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.jetbrains.annotations.NotNull;
@@ -19,6 +22,7 @@ import java.util.Date;
*
* @author fanlyun
*/
@Slf4j
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";
@@ -77,6 +81,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return parseDateToStr(YYYY_MM_DD, date);
}
/**
* 格式化日期
*