From 020d409f3e065fd81645dd38eae466329e1a87a5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 8 Oct 2021 14:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=85=91=E6=8D=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ExchangedListJMResultDTO.java | 5 ++ .../AcitveProductExchangeController.java | 7 +- .../com/elink/esua/epdc/dao/AppAcitveDao.java | 1 + .../excel/AcitveProductExchangeExcel.java | 72 +++++++++---------- .../service/impl/AppAcitveServiceImpl.java | 2 +- .../main/resources/mapper/AppAcitveDao.xml | 13 ++++ 6 files changed, 62 insertions(+), 38 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListJMResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListJMResultDTO.java index e558070fb..81c645945 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListJMResultDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListJMResultDTO.java @@ -63,6 +63,11 @@ public class ExchangedListJMResultDTO implements Serializable { */ private String qrcodeUrl; + /** + * 兑换部门名称 + */ + private String deptName; + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java index e1b20eeba..3802e5f9e 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dao.AcitveProductExchangeDao; import com.elink.esua.epdc.dto.AcitveProductExchangeDTO; import com.elink.esua.epdc.excel.AcitveProductExchangeExcel; import com.elink.esua.epdc.service.AcitveProductExchangeService; @@ -49,6 +50,9 @@ public class AcitveProductExchangeController { @Autowired private AcitveProductExchangeService acitveProductExchangeService; + @Autowired + private AcitveProductExchangeDao acitveProductExchangeDao; + @GetMapping("page") public Result> page(@RequestParam Map params){ // PageData page = acitveProductExchangeService.page(params); @@ -88,7 +92,8 @@ public class AcitveProductExchangeController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = acitveProductExchangeService.list(params); +// List list = acitveProductExchangeService.list(params); + List list = acitveProductExchangeDao.getPhrasePage(params); ExcelUtils.exportExcelToTarget(response, null, list, AcitveProductExchangeExcel.class); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java index eae33df36..6d52c8376 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java @@ -52,6 +52,7 @@ public interface AppAcitveDao { List checkState(ExchangedCheckFormDTO formDto); Integer checkPower(@Param("deptId") String deptId, @Param("productId") String productId); + Integer checkPowerNew(@Param("deptId") String deptId, @Param("productId") String productId); List getExchangedJMList(ExchangedListJMFormDTO formDto); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/AcitveProductExchangeExcel.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/AcitveProductExchangeExcel.java index b905bff10..599dd6d39 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/AcitveProductExchangeExcel.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/AcitveProductExchangeExcel.java @@ -23,7 +23,7 @@ import lombok.Data; import java.util.Date; /** - * 商品兑换表 + * 商品兑换表 * * @author elink elink@elink-cn.com * @since v1.0.0 2021-09-23 @@ -31,56 +31,56 @@ import java.util.Date; @Data public class AcitveProductExchangeExcel { - @Excel(name = "兑换id") - private String id; +// @Excel(name = "兑换id") +// private String id; - @Excel(name = "兑换人id") - private String userId; +// @Excel(name = "兑换人id") +// private String userId; @Excel(name = "兑换人姓名") private String userName; - @Excel(name = "商品id") - private String productId; +// @Excel(name = "商品id") +// private String productId; @Excel(name = "商品名称") private String productName; - @Excel(name = "兑换时间") + @Excel(name = "兑换时间", format = "yyyy-MM-dd HH:mm:ss") private Date exchangeTime; - @Excel(name = "兑换状态0：未核销，1：已核销") - private String exchangeState; + @Excel(name = "兑换状态") + private String exchangeStateName; - @Excel(name = "核销人(工作人员)") - private String checkSysUserId; +// @Excel(name = "核销人") +// private String checkSysUserId; - @Excel(name = "核销二维码地址") - private String qrCodeUrl; +// @Excel(name = "核销二维码地址") +// private String qrCodeUrl; - @Excel(name = "核销人姓名(工作人员)") + @Excel(name = "核销人姓名") private String checkSysUserName; - @Excel(name = "核销时间") + @Excel(name = "核销时间", format = "yyyy-MM-dd HH:mm:ss") private Date checkTime; - @Excel(name = "删除标记 0：未删除，1：已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file +// @Excel(name = "删除标记 0：未删除，1：已删除") +// private String delFlag; +// +// @Excel(name = "乐观锁") +// private Integer revision; +// +// @Excel(name = "创建人") +// private String createdBy; +// +// @Excel(name = "创建时间") +// private Date createdTime; +// +// @Excel(name = "更新人") +// private String updatedBy; +// +// @Excel(name = "更新时间") +// private Date updatedTime; + + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java index 1024df957..86181c30e 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java @@ -88,7 +88,7 @@ public class AppAcitveServiceImpl implements AppAcitveService { if(list.size() > 0){ AcitveProductExchangeDTO acitveProductExchangeDTO = list.get(0); // 判断当前登陆人是否有该商品的核销权限 - Integer isPower = appAcitveDao.checkPower(deptId,acitveProductExchangeDTO.getProductId()); + Integer isPower = appAcitveDao.checkPowerNew(deptId,acitveProductExchangeDTO.getProductId()); if(isPower > 0){ acitveProductExchangeDTO.setExchangeState("1"); acitveProductExchangeDTO.setCheckSysUserId(userId); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml index 2f20f51eb..f28fd4b46 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml @@ -74,6 +74,18 @@ and a.PRODUCT_ID = #{productId} +