Skip to content

P
promotion-service
提交 8798a5e4 authored 作者: 窦馨雨's avatar 窦馨雨
浏览文件
操作

合并分支 'dxy' 到 'qa'

CP计划小程序改造，修改拼接字符串 查看合并请求 !81
上级 f7106ab9 43c15900
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 210 行删除
src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java
浏览文件 @ 8798a5e4
package com.wangxiaolu.promotion.controller.activity.temporary;
import com.wangxiaolu.promotion.controller.user.tem.TemporaryInfoQueryController;
import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
import com.alibaba.nacos.client.utils.StringUtils;
import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
import com.wangxiaolu.promotion.exception.DataException;
import com.wangxiaolu.promotion.exception.ParamException;
......@@ -23,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.Objects;
/**
......@@ -154,7 +154,22 @@ public class TemporaryActivityCoreController {
throw new DataException(RCode.NOT_GFQ_PHOTO_ERROR);
} else if (CollectionUtils.isEmpty(activityReportedDto.getScbbwlPhotoInfos()) ){
throw new DataException(RCode.NOT_SCBBWL_PHOTO_ERROR);
}else if (StringUtils.isBlank(activityReportedDto.getHasBlackDuckFlavor())){
throw new DataException(RCode.NOT_BLACK_DUCK_FLAVOR_ERROR);
}else if (activityReportedDto.getBlackDuckTastingNum() == null || activityReportedDto.getBlackDuckTastingNum() == 0 ){
throw new DataException(RCode.NOT_BLACK_DUCK_TASTING_NUM_ERROR);
}else if (activityReportedDto.getBraisedTastingNum() == null ){
throw new DataException(RCode.NOT_BRAISED_TASTING_NUM_ERROR);
}else if (activityReportedDto.getGiftNum() == null ){
throw new DataException(RCode.NOT_GIFT_NUM_ERROR);
}else if (activityReportedDto.getPromotionSales() == null ||(1== BigDecimal.ZERO.compareTo(activityReportedDto.getPromotionSales()))){
throw new DataException(RCode.NOT_PROMOTION_SALES_ERROR);
}else if (activityReportedDto.getBlackDuckSales() == null ){
throw new DataException(RCode.NOT_BLACK_DUCK_SALES_ERROR);
}else if (activityReportedDto.getGiftBoxSales() == null ){
throw new DataException(RCode.NOT_GIFT_SALES_ERROR);
}
tempActivityCoreService.activityReportedSubmit(id);
return R.success();
}
......
src/main/java/com/wangxiaolu/promotion/domain/inspection/mapper/entity/InspectionInfoDO.java
浏览文件 @ 8798a5e4
......@@ -307,209 +307,38 @@ public class InspectionInfoDO implements Serializable {
*/
private String storeZhiPhoto;
/**
* promotion_manage_employee表id
*/
private Integer employeeId;
/**
* 姓名
*/
private String employeeName;
/**
* 员工工号
*/
private String employeeNo;
/**
* 创建人
*/
private String createBy ;
/**
* 修改人
*/
private String modifyBy ;
/**
* 创建时间
*/
private Date createTime ;
/**
* 修改时间
*/
private Date modifyTime ;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
InspectionInfoDO other = (InspectionInfoDO) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
&& (this.getDepQcOrgName() == null ? other.getDepQcOrgName() == null : this.getDepQcOrgName().equals(other.getDepQcOrgName()))
&& (this.getDealerId() == null ? other.getDealerId() == null : this.getDealerId().equals(other.getDealerId()))
&& (this.getDealerName() == null ? other.getDealerName() == null : this.getDealerName().equals(other.getDealerName()))
&& (this.getStoreCode() == null ? other.getStoreCode() == null : this.getStoreCode().equals(other.getStoreCode()))
&& (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName()))
&& (this.getAddr() == null ? other.getAddr() == null : this.getAddr().equals(other.getAddr()))
&& (this.getPattern() == null ? other.getPattern() == null : this.getPattern().equals(other.getPattern()))
&& (this.getInspectionDate() == null ? other.getInspectionDate() == null : this.getInspectionDate().equals(other.getInspectionDate()))
&& (this.getInspectionTime() == null ? other.getInspectionTime() == null : this.getInspectionTime().equals(other.getInspectionTime()))
&& (this.getLeaveStoreTime() == null ? other.getLeaveStoreTime() == null : this.getLeaveStoreTime().equals(other.getLeaveStoreTime()))
&& (this.getOnDutyStatus() == null ? other.getOnDutyStatus() == null : this.getOnDutyStatus().equals(other.getOnDutyStatus()))
&& (this.getOnDutyRate() == null ? other.getOnDutyRate() == null : this.getOnDutyRate().equals(other.getOnDutyRate()))
&& (this.getOnDutyCount() == null ? other.getOnDutyCount() == null : this.getOnDutyCount().equals(other.getOnDutyCount()))
&& (this.getIsOnDuty() == null ? other.getIsOnDuty() == null : this.getIsOnDuty().equals(other.getIsOnDuty()))
&& (this.getOffDutyCallTime() == null ? other.getOffDutyCallTime() == null : this.getOffDutyCallTime().equals(other.getOffDutyCallTime()))
&& (this.getIsCallConnected() == null ? other.getIsCallConnected() == null : this.getIsCallConnected().equals(other.getIsCallConnected()))
&& (this.getIsReconnectedAfter5min() == null ? other.getIsReconnectedAfter5min() == null : this.getIsReconnectedAfter5min().equals(other.getIsReconnectedAfter5min()))
&& (this.getIsBackToWorkWithin10min() == null ? other.getIsBackToWorkWithin10min() == null : this.getIsBackToWorkWithin10min().equals(other.getIsBackToWorkWithin10min()))
&& (this.getTotalScore() == null ? other.getTotalScore() == null : this.getTotalScore().equals(other.getTotalScore()))
&& (this.getSalesAssessmentScore() == null ? other.getSalesAssessmentScore() == null : this.getSalesAssessmentScore().equals(other.getSalesAssessmentScore()))
&& (this.getPromotionAssessmentScore() == null ? other.getPromotionAssessmentScore() == null : this.getPromotionAssessmentScore().equals(other.getPromotionAssessmentScore()))
&& (this.getHasSchedulePromotionScore() == null ? other.getHasSchedulePromotionScore() == null : this.getHasSchedulePromotionScore().equals(other.getHasSchedulePromotionScore()))
&& (this.getGroundStackHasMainProductScore() == null ? other.getGroundStackHasMainProductScore() == null : this.getGroundStackHasMainProductScore().equals(other.getGroundStackHasMainProductScore()))
&& (this.getGroundStackOnlyWangxiaoluScore() == null ? other.getGroundStackOnlyWangxiaoluScore() == null : this.getGroundStackOnlyWangxiaoluScore().equals(other.getGroundStackOnlyWangxiaoluScore()))
&& (this.getGroundStackStockFullScore() == null ? other.getGroundStackStockFullScore() == null : this.getGroundStackStockFullScore().equals(other.getGroundStackStockFullScore()))
&& (this.getHasPromotionMaterialsScore() == null ? other.getHasPromotionMaterialsScore() == null : this.getHasPromotionMaterialsScore().equals(other.getHasPromotionMaterialsScore()))
&& (this.getWearsWangxiaoluApronScore() == null ? other.getWearsWangxiaoluApronScore() == null : this.getWearsWangxiaoluApronScore().equals(other.getWearsWangxiaoluApronScore()))
&& (this.getHasTastingProductScore() == null ? other.getHasTastingProductScore() == null : this.getHasTastingProductScore().equals(other.getHasTastingProductScore()))
&& (this.getHasTastingTableScore() == null ? other.getHasTastingTableScore() == null : this.getHasTastingTableScore().equals(other.getHasTastingTableScore()))
&& (this.getHasTastingPlateScore() == null ? other.getHasTastingPlateScore() == null : this.getHasTastingPlateScore().equals(other.getHasTastingPlateScore()))
&& (this.getHasTastingCupScore() == null ? other.getHasTastingCupScore() == null : this.getHasTastingCupScore().equals(other.getHasTastingCupScore()))
&& (this.getWearsMaskGlovesScore() == null ? other.getWearsMaskGlovesScore() == null : this.getWearsMaskGlovesScore().equals(other.getWearsMaskGlovesScore()))
&& (this.getHasToothpickBonusScore() == null ? other.getHasToothpickBonusScore() == null : this.getHasToothpickBonusScore().equals(other.getHasToothpickBonusScore()))
&& (this.getHasGarbageCanBonusScore() == null ? other.getHasGarbageCanBonusScore() == null : this.getHasGarbageCanBonusScore().equals(other.getHasGarbageCanBonusScore()))
&& (this.getKnowsDistanceSolicitSkillScore() == null ? other.getKnowsDistanceSolicitSkillScore() == null : this.getKnowsDistanceSolicitSkillScore().equals(other.getKnowsDistanceSolicitSkillScore()))
&& (this.getKnowsProductSellingPointsScore() == null ? other.getKnowsProductSellingPointsScore() == null : this.getKnowsProductSellingPointsScore().equals(other.getKnowsProductSellingPointsScore()))
&& (this.getGreetsCustomersActivelyScore() == null ? other.getGreetsCustomersActivelyScore() == null : this.getGreetsCustomersActivelyScore().equals(other.getGreetsCustomersActivelyScore()))
&& (this.getIntroducesProductScoresScore() == null ? other.getIntroducesProductScoresScore() == null : this.getIntroducesProductScoresScore().equals(other.getIntroducesProductScoresScore()))
&& (this.getPromotesSalesActivelyScore() == null ? other.getPromotesSalesActivelyScore() == null : this.getPromotesSalesActivelyScore().equals(other.getPromotesSalesActivelyScore()))
&& (this.getHasPromotionGiftsScore() == null ? other.getHasPromotionGiftsScore() == null : this.getHasPromotionGiftsScore().equals(other.getHasPromotionGiftsScore()))
&& (this.getSellsNonWangxiaoluProductsScore() == null ? other.getSellsNonWangxiaoluProductsScore() == null : this.getSellsNonWangxiaoluProductsScore().equals(other.getSellsNonWangxiaoluProductsScore()))
&& (this.getPromotionActivityContent() == null ? other.getPromotionActivityContent() == null : this.getPromotionActivityContent().equals(other.getPromotionActivityContent()))
&& (this.getHasGroundStack() == null ? other.getHasGroundStack() == null : this.getHasGroundStack().equals(other.getHasGroundStack()))
&& (this.getHasBlackDuckDisplay() == null ? other.getHasBlackDuckDisplay() == null : this.getHasBlackDuckDisplay().equals(other.getHasBlackDuckDisplay()))
&& (this.getHasBlackDuckTasting() == null ? other.getHasBlackDuckTasting() == null : this.getHasBlackDuckTasting().equals(other.getHasBlackDuckTasting()))
&& (this.getOtherBrandHasTastingTable() == null ? other.getOtherBrandHasTastingTable() == null : this.getOtherBrandHasTastingTable().equals(other.getOtherBrandHasTastingTable()))
&& (this.getPedestrianCountWithin10min() == null ? other.getPedestrianCountWithin10min() == null : this.getPedestrianCountWithin10min().equals(other.getPedestrianCountWithin10min()))
&& (this.getTotalTastingProductCount() == null ? other.getTotalTastingProductCount() == null : this.getTotalTastingProductCount().equals(other.getTotalTastingProductCount()))
&& (this.getTastingProductCountByFlavor() == null ? other.getTastingProductCountByFlavor() == null : this.getTastingProductCountByFlavor().equals(other.getTastingProductCountByFlavor()))
&& (this.getOtherBrandTastingTableProofUrl() == null ? other.getOtherBrandTastingTableProofUrl() == null : this.getOtherBrandTastingTableProofUrl().equals(other.getOtherBrandTastingTableProofUrl()))
&& (this.getNonWangxiaoluSalesProofUrl() == null ? other.getNonWangxiaoluSalesProofUrl() == null : this.getNonWangxiaoluSalesProofUrl().equals(other.getNonWangxiaoluSalesProofUrl()))
&& (this.getStorePicture() == null ? other.getStorePicture() == null : this.getStorePicture().equals(other.getStorePicture()))
&& (this.getTemWorkPhotos() == null ? other.getTemWorkPhotos() == null : this.getTemWorkPhotos().equals(other.getTemWorkPhotos()))
&& (this.getStoreTcPhoto() == null ? other.getStoreTcPhoto() == null : this.getStoreTcPhoto().equals(other.getStoreTcPhoto()))
&& (this.getStoreZhiPhoto() == null ? other.getStoreZhiPhoto() == null : this.getStoreZhiPhoto().equals(other.getStoreZhiPhoto()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
result = prime * result + ((getDepQcOrgName() == null) ? 0 : getDepQcOrgName().hashCode());
result = prime * result + ((getDealerId() == null) ? 0 : getDealerId().hashCode());
result = prime * result + ((getDealerName() == null) ? 0 : getDealerName().hashCode());
result = prime * result + ((getStoreCode() == null) ? 0 : getStoreCode().hashCode());
result = prime * result + ((getStoreName() == null) ? 0 : getStoreName().hashCode());
result = prime * result + ((getAddr() == null) ? 0 : getAddr().hashCode());
result = prime * result + ((getPattern() == null) ? 0 : getPattern().hashCode());
result = prime * result + ((getInspectionDate() == null) ? 0 : getInspectionDate().hashCode());
result = prime * result + ((getInspectionTime() == null) ? 0 : getInspectionTime().hashCode());
result = prime * result + ((getLeaveStoreTime() == null) ? 0 : getLeaveStoreTime().hashCode());
result = prime * result + ((getOnDutyStatus() == null) ? 0 : getOnDutyStatus().hashCode());
result = prime * result + ((getOnDutyRate() == null) ? 0 : getOnDutyRate().hashCode());
result = prime * result + ((getOnDutyCount() == null) ? 0 : getOnDutyCount().hashCode());
result = prime * result + ((getIsOnDuty() == null) ? 0 : getIsOnDuty().hashCode());
result = prime * result + ((getOffDutyCallTime() == null) ? 0 : getOffDutyCallTime().hashCode());
result = prime * result + ((getIsCallConnected() == null) ? 0 : getIsCallConnected().hashCode());
result = prime * result + ((getIsReconnectedAfter5min() == null) ? 0 : getIsReconnectedAfter5min().hashCode());
result = prime * result + ((getIsBackToWorkWithin10min() == null) ? 0 : getIsBackToWorkWithin10min().hashCode());
result = prime * result + ((getTotalScore() == null) ? 0 : getTotalScore().hashCode());
result = prime * result + ((getSalesAssessmentScore() == null) ? 0 : getSalesAssessmentScore().hashCode());
result = prime * result + ((getPromotionAssessmentScore() == null) ? 0 : getPromotionAssessmentScore().hashCode());
result = prime * result + ((getHasSchedulePromotionScore() == null) ? 0 : getHasSchedulePromotionScore().hashCode());
result = prime * result + ((getGroundStackHasMainProductScore() == null) ? 0 : getGroundStackHasMainProductScore().hashCode());
result = prime * result + ((getGroundStackOnlyWangxiaoluScore() == null) ? 0 : getGroundStackOnlyWangxiaoluScore().hashCode());
result = prime * result + ((getGroundStackStockFullScore() == null) ? 0 : getGroundStackStockFullScore().hashCode());
result = prime * result + ((getHasPromotionMaterialsScore() == null) ? 0 : getHasPromotionMaterialsScore().hashCode());
result = prime * result + ((getWearsWangxiaoluApronScore() == null) ? 0 : getWearsWangxiaoluApronScore().hashCode());
result = prime * result + ((getHasTastingProductScore() == null) ? 0 : getHasTastingProductScore().hashCode());
result = prime * result + ((getHasTastingTableScore() == null) ? 0 : getHasTastingTableScore().hashCode());
result = prime * result + ((getHasTastingPlateScore() == null) ? 0 : getHasTastingPlateScore().hashCode());
result = prime * result + ((getHasTastingCupScore() == null) ? 0 : getHasTastingCupScore().hashCode());
result = prime * result + ((getWearsMaskGlovesScore() == null) ? 0 : getWearsMaskGlovesScore().hashCode());
result = prime * result + ((getHasToothpickBonusScore() == null) ? 0 : getHasToothpickBonusScore().hashCode());
result = prime * result + ((getHasGarbageCanBonusScore() == null) ? 0 : getHasGarbageCanBonusScore().hashCode());
result = prime * result + ((getKnowsDistanceSolicitSkillScore() == null) ? 0 : getKnowsDistanceSolicitSkillScore().hashCode());
result = prime * result + ((getKnowsProductSellingPointsScore() == null) ? 0 : getKnowsProductSellingPointsScore().hashCode());
result = prime * result + ((getGreetsCustomersActivelyScore() == null) ? 0 : getGreetsCustomersActivelyScore().hashCode());
result = prime * result + ((getIntroducesProductScoresScore() == null) ? 0 : getIntroducesProductScoresScore().hashCode());
result = prime * result + ((getPromotesSalesActivelyScore() == null) ? 0 : getPromotesSalesActivelyScore().hashCode());
result = prime * result + ((getHasPromotionGiftsScore() == null) ? 0 : getHasPromotionGiftsScore().hashCode());
result = prime * result + ((getSellsNonWangxiaoluProductsScore() == null) ? 0 : getSellsNonWangxiaoluProductsScore().hashCode());
result = prime * result + ((getPromotionActivityContent() == null) ? 0 : getPromotionActivityContent().hashCode());
result = prime * result + ((getHasGroundStack() == null) ? 0 : getHasGroundStack().hashCode());
result = prime * result + ((getHasBlackDuckDisplay() == null) ? 0 : getHasBlackDuckDisplay().hashCode());
result = prime * result + ((getHasBlackDuckTasting() == null) ? 0 : getHasBlackDuckTasting().hashCode());
result = prime * result + ((getOtherBrandHasTastingTable() == null) ? 0 : getOtherBrandHasTastingTable().hashCode());
result = prime * result + ((getPedestrianCountWithin10min() == null) ? 0 : getPedestrianCountWithin10min().hashCode());
result = prime * result + ((getTotalTastingProductCount() == null) ? 0 : getTotalTastingProductCount().hashCode());
result = prime * result + ((getTastingProductCountByFlavor() == null) ? 0 : getTastingProductCountByFlavor().hashCode());
result = prime * result + ((getOtherBrandTastingTableProofUrl() == null) ? 0 : getOtherBrandTastingTableProofUrl().hashCode());
result = prime * result + ((getNonWangxiaoluSalesProofUrl() == null) ? 0 : getNonWangxiaoluSalesProofUrl().hashCode());
result = prime * result + ((getStorePicture() == null) ? 0 : getStorePicture().hashCode());
result = prime * result + ((getTemWorkPhotos() == null) ? 0 : getTemWorkPhotos().hashCode());
result = prime * result + ((getStoreTcPhoto() == null) ? 0 : getStoreTcPhoto().hashCode());
result = prime * result + ((getStoreZhiPhoto() == null) ? 0 : getStoreZhiPhoto().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", planId=").append(planId);
sb.append(", depQcOrgName=").append(depQcOrgName);
sb.append(", dealerId=").append(dealerId);
sb.append(", dealerName=").append(dealerName);
sb.append(", storeCode=").append(storeCode);
sb.append(", storeName=").append(storeName);
sb.append(", addr=").append(addr);
sb.append(", pattern=").append(pattern);
sb.append(", inspectionDate=").append(inspectionDate);
sb.append(", inspectionTime=").append(inspectionTime);
sb.append(", leaveStoreTime=").append(leaveStoreTime);
sb.append(", onDutyStatus=").append(onDutyStatus);
sb.append(", onDutyRate=").append(onDutyRate);
sb.append(", onDutyCount=").append(onDutyCount);
sb.append(", isOnDuty=").append(isOnDuty);
sb.append(", offDutyCallTime=").append(offDutyCallTime);
sb.append(", isCallConnected=").append(isCallConnected);
sb.append(", isReconnectedAfter5min=").append(isReconnectedAfter5min);
sb.append(", isBackToWorkWithin10min=").append(isBackToWorkWithin10min);
sb.append(", totalScore=").append(totalScore);
sb.append(", salesAssessmentScore=").append(salesAssessmentScore);
sb.append(", promotionAssessmentScore=").append(promotionAssessmentScore);
sb.append(", hasSchedulePromotionScore=").append(hasSchedulePromotionScore);
sb.append(", groundStackHasMainProductScore=").append(groundStackHasMainProductScore);
sb.append(", groundStackOnlyWangxiaoluScore=").append(groundStackOnlyWangxiaoluScore);
sb.append(", groundStackStockFullScore=").append(groundStackStockFullScore);
sb.append(", hasPromotionMaterialsScore=").append(hasPromotionMaterialsScore);
sb.append(", wearsWangxiaoluApronScore=").append(wearsWangxiaoluApronScore);
sb.append(", hasTastingProductScore=").append(hasTastingProductScore);
sb.append(", hasTastingTableScore=").append(hasTastingTableScore);
sb.append(", hasTastingPlateScore=").append(hasTastingPlateScore);
sb.append(", hasTastingCupScore=").append(hasTastingCupScore);
sb.append(", wearsMaskGlovesScore=").append(wearsMaskGlovesScore);
sb.append(", hasToothpickBonusScore=").append(hasToothpickBonusScore);
sb.append(", hasGarbageCanBonusScore=").append(hasGarbageCanBonusScore);
sb.append(", knowsDistanceSolicitSkillScore=").append(knowsDistanceSolicitSkillScore);
sb.append(", knowsProductSellingPointsScore=").append(knowsProductSellingPointsScore);
sb.append(", greetsCustomersActivelyScore=").append(greetsCustomersActivelyScore);
sb.append(", introducesProductScoresScore=").append(introducesProductScoresScore);
sb.append(", promotesSalesActivelyScore=").append(promotesSalesActivelyScore);
sb.append(", hasPromotionGiftsScore=").append(hasPromotionGiftsScore);
sb.append(", sellsNonWangxiaoluProductsScore=").append(sellsNonWangxiaoluProductsScore);
sb.append(", promotionActivityContent=").append(promotionActivityContent);
sb.append(", hasGroundStack=").append(hasGroundStack);
sb.append(", hasBlackDuckDisplay=").append(hasBlackDuckDisplay);
sb.append(", hasBlackDuckTasting=").append(hasBlackDuckTasting);
sb.append(", otherBrandHasTastingTable=").append(otherBrandHasTastingTable);
sb.append(", pedestrianCountWithin10Min=").append(pedestrianCountWithin10min);
sb.append(", totalTastingProductCount=").append(totalTastingProductCount);
sb.append(", tastingProductCountByFlavor=").append(tastingProductCountByFlavor);
sb.append(", otherBrandTastingTableProofUrl=").append(otherBrandTastingTableProofUrl);
sb.append(", nonWangxiaoluSalesProofUrl=").append(nonWangxiaoluSalesProofUrl);
sb.append(", storePicture=").append(storePicture);
sb.append(", temWorkPhotos=").append(temWorkPhotos);
sb.append(", storeTcPhoto=").append(storeTcPhoto);
sb.append(", storeZhiPhoto=").append(storeZhiPhoto);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/wangxiaolu/promotion/pojo/activity/inspectionInfo/dto/InspectionInfoDto.java
浏览文件 @ 8798a5e4
......@@ -298,4 +298,36 @@ public class InspectionInfoDto {
* 主货架照片
*/
private String storeZhiPhoto;
/**
* promotion_manage_employee表id
*/
private Integer employeeId;
/**
* 姓名
*/
private String employeeName;
/**
* 员工工号
*/
private String employeeNo;
/**
* 创建人
*/
private String createBy ;
/**
* 修改人
*/
private String modifyBy ;
/**
* 创建时间
*/
private Date createTime ;
/**
* 修改时间
*/
private Date modifyTime ;
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/inspectionInfo/vo/InspectionInfoVO.java
浏览文件 @ 8798a5e4
......@@ -263,4 +263,19 @@ public class InspectionInfoVO {
* 主货架照片
*/
private String storeZhiPhoto;
/**
* promotion_manage_employee表id
*/
private Integer employeeId;
/**
* 姓名
*/
private String employeeName;
/**
* 员工工号
*/
private String employeeNo;
}
src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanCoreServiceImpl.java
浏览文件 @ 8798a5e4
......@@ -68,12 +68,15 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
inspectionInfoDto.setStoreCode(activityPlanInfoDto.getStoreCode());
inspectionInfoDto.setStoreName(activityPlanInfoDto.getStoreName());
inspectionInfoDto.setPattern(activityPlanInfoDto.getPattern());
inspectionInfoDto.setCreateTime(new Date());
inspectionInfoDto.setCreateBy(inspectionInfoDto.getEmployeeName());
return inspectionInfoDao.save(inspectionInfoDto);
}
@Override
public InspectionInfoDto updateByIdV2(InspectionInfoDto inspectionInfoDto) {
inspectionInfoDto.setModifyTime(new Date());
inspectionInfoDto.setModifyBy(inspectionInfoDto.getEmployeeName());
return inspectionInfoDao.updateById(inspectionInfoDto);
}
......
src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityCoreServiceImpl.java
浏览文件 @ 8798a5e4
......@@ -78,10 +78,10 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
throw new FlowException(RCode.DATA_HAVE_ERROR);
}
// 获取计划信息，补充此计划的销售品项
// 获取计划信息，补充此计划的销售品项和执行方式
ActivityPlanInfoDto planInfoDto = activityPlanInfoDao.selectById(temActDto.getPlanId());
temActDto.setPrdClass(Objects.isNull(planInfoDto) ? null : planInfoDto.getPrdClass());
temActDto.setExecuteModePlan(Objects.isNull(planInfoDto) ? null : planInfoDto.getPlanExecuteMode());
// 返回生成的活动id
long reportedId = temporaryActivityReportedDao.activityDataSave(temActDto);
temActDto.setId(reportedId);
......
src/main/resources/mapper/inspection/InspectionInfoMapper.xml
浏览文件 @ 8798a5e4
......@@ -73,6 +73,15 @@
<!-- 6. JSON类型 -->
<result property="temWorkPhotos" column="tem_work_photos" jdbcType="VARCHAR" />
<!-- 7. 新增字段 -->
<result property="employeeId" column="employee_id" jdbcType="INTEGER" />
<result property="employeeName" column="employee_name" jdbcType="VARCHAR" />
<result property="employeeNo" column="employee_no" jdbcType="VARCHAR" />
<result property="createBy" column="create_by" jdbcType="VARCHAR" />
<result property="modifyBy" column="modify_by" jdbcType="VARCHAR" />
<result property="createTime" column="create_time" jdbcType="TIMESTAMP" />
<result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="Base_Column_List">
......@@ -87,6 +96,6 @@
has_promotion_gifts_score,sells_non_wangxiaolu_products_score,promotion_activity_content,has_ground_stack,has_black_duck_display,
has_black_duck_tasting,other_brand_has_tasting_table,pedestrian_count_within_10_min,total_tasting_product_count,tasting_product_count_by_flavor,
other_brand_tasting_table_proof_url,non_wangxiaolu_sales_proof_url,store_picture,tem_work_photos,store_tc_photo,
store_zhi_photo
store_zhi_photo,employee_id,employee_name,employee_no,create_by,modify_by,create_time,modify_time
</sql>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论