商品兑换权限修改

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;
+
 
 
 }

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<PageData<AcitveProductExchangeDTO>> page(@RequestParam Map<String, Object> params){
 //        PageData<AcitveProductExchangeDTO> page = acitveProductExchangeService.page(params);
@@ -88,7 +92,8 @@ public class AcitveProductExchangeController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<AcitveProductExchangeDTO> list = acitveProductExchangeService.list(params);
+//        List<AcitveProductExchangeDTO> list = acitveProductExchangeService.list(params);
+        List<AcitveProductExchangeDTO> list = acitveProductExchangeDao.getPhrasePage(params);
         ExcelUtils.exportExcelToTarget(response, null, list, AcitveProductExchangeExcel.class);
     }
 

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<AcitveProductExchangeDTO> checkState(ExchangedCheckFormDTO formDto);
 
     Integer checkPower(@Param("deptId") String deptId, @Param("productId") String productId);
+    Integer checkPowerNew(@Param("deptId") String deptId, @Param("productId") String productId);
 
     List<ExchangedListJMResultDTO> getExchangedJMList(ExchangedListJMFormDTO formDto);
 

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/AcitveProductExchangeExcel.java

@@ -31,56 +31,56 @@ import java.util.Date;
 @Data
 public class AcitveProductExchangeExcel {
 
-    @Excel(name = "兑换id")
+//    @Excel(name = "兑换id")
-    private String id;
+//    private String id;
 
-    @Excel(name = "兑换人id")
+//    @Excel(name = "兑换人id")
-    private String userId;
+//    private String userId;
 
     @Excel(name = "兑换人姓名")
     private String userName;
 
-    @Excel(name = "商品id")
+//    @Excel(name = "商品id")
-    private String productId;
+//    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：已核销")
+    @Excel(name = "兑换状态")
-    private String exchangeState;
+    private String exchangeStateName;
 
-    @Excel(name = "核销人(工作人员)")
+//    @Excel(name = "核销人")
-    private String checkSysUserId;
+//    private String checkSysUserId;
 
-    @Excel(name = "核销二维码地址")
+//    @Excel(name = "核销二维码地址")
-    private String qrCodeUrl;
+//    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：已删除")
+//    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String delFlag;
+//    private String delFlag;
-
+//
-    @Excel(name = "乐观锁")
+//    @Excel(name = "乐观锁")
-    private Integer revision;
+//    private Integer revision;
-
+//
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private String createdBy;
+//    private String createdBy;
-
+//
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private Date createdTime;
+//    private Date createdTime;
-
+//
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private String updatedBy;
+//    private String updatedBy;
-
+//
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private Date updatedTime;
+//    private Date updatedTime;
 
 
 }

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);

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml

@@ -74,6 +74,18 @@
             and a.PRODUCT_ID = #{productId}
         </if>
     </select>
+    <select id="checkPowerNew" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select
+        count(a.ID)
+        from epdc_acitve_product_info a
+        where a.DEL_FLAG = 0
+        <if test="deptId != null and deptId != ''">
+            and a.DEPT_ID = #{deptId}
+        </if>
+        <if test="productId != null and productId != ''">
+            and a.PRODUCT_ID = #{productId}
+        </if>
+    </select>
 
     <select id="getExchangedJMList" resultType="com.elink.esua.epdc.dto.result.ExchangedListJMResultDTO"
             parameterType="com.elink.esua.epdc.dto.form.ExchangedListJMFormDTO">
@@ -82,6 +94,7 @@
         a.PRODUCT_NAME name,
         a.EXCHANGE_STATE state,
         b.POINTS points,
+        b.DEPT_NAME deptName,
         a.EXCHANGE_TIME exchangeTime,
         a.QR_CODE_URL qrcodeUrl
         from epdc_acitve_product_exchange a