From 1dab792aad936215d54cfd0f7845d23d78264c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 23 Jun 2025 21:41:41 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=A2=84=E7=82=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/PreFryRecordsDAO.java | 5 ++ .../store/mapper/PreFryRecordsMapper.java | 11 ++++- .../resources/mapper/PreFryRecordsMapper.xml | 49 +++++++++++++++++++ .../dto/pre/fry/PreFryRecordQueryDTO.java | 39 +++++++++++++++ .../store/dto/pre/fry/PreFryRecordsDTO.java | 37 ++++++++++++++ .../cool/store/entity/PreFryRecordsDO.java | 21 ++++++++ .../store/service/PreFryRecordsService.java | 7 +-- .../impl/PreFryRecordsServiceImpl.java | 8 +++ .../webb/PCPreFryRecordsController.java | 41 ++++++++++++++++ 9 files changed, 211 insertions(+), 7 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordQueryDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDTO.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPreFryRecordsController.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java index 6ae4a2491..21ef9179a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java @@ -2,6 +2,8 @@ package com.cool.store.dao; import com.cool.store.constants.CommonConstants; import com.cool.store.dto.pre.fry.DailyFryCountDTO; +import com.cool.store.dto.pre.fry.PreFryRecordQueryDTO; +import com.cool.store.dto.pre.fry.PreFryRecordsDTO; import com.cool.store.entity.PreFryRecordsDO; import com.cool.store.mapper.PreFryRecordsMapper; import org.apache.commons.collections4.CollectionUtils; @@ -75,6 +77,9 @@ public class PreFryRecordsDAO { } + public List selectByQueryDTO(PreFryRecordQueryDTO dto) { + return preFryRecordsMapper.selectByQueryDTO(dto); + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java index 299e880ae..7c94ec693 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java @@ -1,6 +1,8 @@ package com.cool.store.mapper; import com.cool.store.dto.pre.fry.DailyFryCountDTO; +import com.cool.store.dto.pre.fry.PreFryRecordQueryDTO; +import com.cool.store.dto.pre.fry.PreFryRecordsDTO; import com.cool.store.entity.PreFryRecordsDO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -22,6 +24,11 @@ public interface PreFryRecordsMapper extends Mapper { @Param("queryDate") String queryDate); - List selectDailyFryCountInCurrentMonth( - @Param("storeCode") String storeCode,@Param("time") Long time); + List selectDailyFryCountInCurrentMonth(@Param("storeCode") String storeCode,@Param("time") Long time); + + + List selectByQueryDTO(@Param("query") PreFryRecordQueryDTO dto); + + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml index 581a5d052..92b83a47d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml @@ -14,6 +14,8 @@ + + @@ -67,6 +69,53 @@ ORDER BY fry_date + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordQueryDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordQueryDTO.java new file mode 100644 index 000000000..650b54f89 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordQueryDTO.java @@ -0,0 +1,39 @@ +package com.cool.store.dto.pre.fry; + +import com.cool.store.common.PageBasicInfo; +import com.github.pagehelper.PageHelper; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2025/6/23 20:49 + * @Version 1.0 + */ +@Data +public class PreFryRecordQueryDTO extends PageBasicInfo { + + @ApiModelProperty("预炸记录编码") + private String recordCode; + @ApiModelProperty("门店编码") + private String storeCode; + @ApiModelProperty("门店名称") + private String storeName; + @ApiModelProperty("产品名称") + private String productName; + @ApiModelProperty("产品编码") + private String productCode; + @ApiModelProperty("状态 当前产品阶段：1-预炸完成，2-存入展示柜，3-放入冰箱，4-次日拿出，5-报废") + private Integer currentStage; + @ApiModelProperty("预炸开始时间") + private Date fryStartDate; + @ApiModelProperty("预炸结束时间") + private Date fryEndDate; + @ApiModelProperty("是否违规 0-未违规 1违规") + private Integer violationFlag; + @ApiModelProperty("违规原因") + private Integer violationReason; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDTO.java new file mode 100644 index 000000000..14e70899b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDTO.java @@ -0,0 +1,37 @@ +package com.cool.store.dto.pre.fry; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2025/6/23 21:10 + * @Version 1.0 + */ +@Data +public class PreFryRecordsDTO { + + @ApiModelProperty("预炸记录ID") + private Long id; + @ApiModelProperty("预炸记录编码") + private String recordCode; + @ApiModelProperty("门店编码") + private String storeCode; + @ApiModelProperty("门店名称") + private String storeName; + @ApiModelProperty("产品编码") + private String productCode; + @ApiModelProperty("产品名称") + private String productName; + @ApiModelProperty("当前状态") + private Integer currentStage; + @ApiModelProperty("预炸完成时间") + private Date fryDate; + @ApiModelProperty("是否违规") + private Integer violationFlag; + @ApiModelProperty("违规原因") + private Integer violationReason; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java index cd66179ce..dff1bf28b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java @@ -70,6 +70,27 @@ public class PreFryRecordsDO { @Column(name = "updated_time") private Date updatedTime; + @Column(name = "updated_flag") + private Integer violationFlag; + @Column(name = "violation_reason") + private Integer violationReason; + + + public Integer getViolationFlag() { + return violationFlag; + } + + public void setViolationFlag(Integer violationFlag) { + this.violationFlag = violationFlag; + } + + public Integer getViolationReason() { + return violationReason; + } + + public void setViolationReason(Integer violationReason) { + this.violationReason = violationReason; + } public Integer getCurrentApplyType() { return currentApplyType; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryRecordsService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryRecordsService.java index 68e1df6f3..e27131478 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryRecordsService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryRecordsService.java @@ -1,9 +1,6 @@ package com.cool.store.service; -import com.cool.store.dto.pre.fry.AddPreFryRecordsDTO; -import com.cool.store.dto.pre.fry.DailyFryCountDTO; -import com.cool.store.dto.pre.fry.FryRecordsQueryDTO; -import com.cool.store.dto.pre.fry.PreFryRecordsDetailDTO; +import com.cool.store.dto.pre.fry.*; import com.cool.store.vo.PartnerUserInfoVO; import com.github.pagehelper.PageInfo; @@ -31,7 +28,7 @@ public interface PreFryRecordsService { List queryByStoreCode(String storeCode, Long time); - + PageInfo queryByQueryDTO(PreFryRecordQueryDTO dto); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java index db1f9d171..fb3907bf3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java @@ -174,6 +174,14 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService { return preFryRecordsDAO.selectDailyFryCountInCurrentMonth(storeCode, time); } + @Override + public PageInfo queryByQueryDTO(PreFryRecordQueryDTO dto) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List preFryRecordQueryDTOS = preFryRecordsDAO.selectByQueryDTO(dto); + PageInfo preFryRecordQueryDTOPageInfo = new PageInfo<>(preFryRecordQueryDTOS); + return preFryRecordQueryDTOPageInfo; + } + private Boolean addPreFryRecordsFlag(Integer applyType,Integer stage){ if (applyType== PreFryApplyTypeEnum.HAS_REFRIGERATED_DISPLAY.getCode() && stage== PRE_FRY_COMPLETED.getCode()){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPreFryRecordsController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPreFryRecordsController.java new file mode 100644 index 000000000..2aad24c0f --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPreFryRecordsController.java @@ -0,0 +1,41 @@ +package com.cool.store.controller.webb; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.context.PartnerUserHolder; +import com.cool.store.dto.pre.fry.*; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.PreFryRecordsService; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2025/6/23 20:36 + * @Version 1.0 + */ +@Slf4j +@Api(tags = "预炸-预炸记录-PC") +@RestController +@RequestMapping("/pc/pre/record/") +public class PCPreFryRecordsController { + + + @Resource + PreFryRecordsService preFryRecordsService; + + + @ApiOperation("预炸品管理记录") + @PostMapping("/queryByQueryDTO") + public ResponseResult> queryByQueryDTO(@RequestBody @Validated PreFryRecordQueryDTO dto) { + log.info("预炸品管理记录：{}", JSONObject.toJSONString(dto)); + return ResponseResult.success(preFryRecordsService.queryByQueryDTO(dto)); + } + + +}