LiFei 2 роки тому
батько
коміт
f52f1bb87f

+ 19 - 3
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/controller/HlwPaymentDetailController.java

@@ -43,6 +43,8 @@ import org.jeecg.modules.hlwuser.mapper.HlwUserMapper;
 import org.jeecg.modules.hlwuser.mapper.HlwUserSubcontractorMapper;
 import org.jeecg.modules.hlwuser.service.IHlwUserService;
 import org.jeecg.modules.utils.DateUtils;
+import org.jeecg.modules.utils.excel.ExcelUtil;
+import org.jeecg.modules.utils.excel.properties.ExportProperties;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -84,6 +86,8 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
     private HlwPaymentMapper hlwPaymentMapper;
     @Resource
     private HlwUserSubcontractorMapper hlwUserSubcontractorMapper;
+    @Autowired
+    private ExportProperties exportProperties;
 
     /**
      * 分页列表查询
@@ -320,14 +324,26 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
     }
 
     /**
-     * 导出excel
+     * 导出excel(下载模板使用,数据部分为空)
      *
      * @param request
      * @param hlwPaymentDetail
      */
+    @ResponseBody
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HlwPaymentDetail hlwPaymentDetail) {
-        return super.exportXls(request, hlwPaymentDetail, HlwPaymentDetail.class, "付款明细表");
+    public void exportXls(HttpServletRequest request, HlwPaymentDetail hlwPaymentDetail,HttpServletResponse response) {
+        // Step.1 组装查询条件
+        // Step.2 获取导出数据
+        List<HlwPaymentDetail> exportList = hlwPaymentDetailService.getList(hlwPaymentDetail);
+        // Step.3 EasyExcel 导出Excel
+        try {
+            String url=exportProperties.getPaymentDetail();
+            String title="付款详情数据";
+            ExcelUtil.exportExcelByTemplateWeb(response, title, url, new HashMap(), exportList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("导出报错===" + e.getMessage());
+        }
     }
 
 

+ 0 - 1
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPaymentDetail.java

@@ -24,7 +24,6 @@ import java.io.Serializable;
  */
 @Data
 @TableName("hlw_payment_detail")
-@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "hlw_payment_detail对象", description = "付款明细表")
 public class HlwPaymentDetail implements Serializable {

+ 2 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/HlwPaymentDetailMapper.java

@@ -60,4 +60,6 @@ public interface HlwPaymentDetailMapper extends BaseMapper<HlwPaymentDetail> {
     Double getCurrentUserDailyAmount(@Param("idcardNumber") String idcardNumber);
 
     Double getCurrentUserMonthlyAmount(@Param("idcardNumber")String idcardNumber);
+
+    List<HlwPaymentDetail> getList(@Param("hlwPaymentDetail")HlwPaymentDetail hlwPaymentDetail);
 }

+ 20 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentDetailMapper.xml

@@ -65,6 +65,26 @@
 		ORDER BY a.update_time DESC, a.id ASC
 	</select>
 
+
+	<select id="getList" resultType="org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail" >
+		SELECT
+		<include refid="hlwPaymentDetailColumns"/>
+		FROM hlw_payment_detail a
+		<include refid="hlwPaymentDetailJoins"/>
+		<where>
+			<if test="hlwPaymentDetail.paymentId != null">
+				and a.payment_id = #{hlwPaymentDetail.paymentId}
+			</if>
+			<if test="hlwPaymentDetail.status != null">
+				and a.status = #{hlwPaymentDetail.status}
+			</if>
+			<if test="hlwPaymentDetail.userName != null and hlwPaymentDetail.userName != ''">
+				and a.user_name like concat('%',#{hlwPaymentDetail.userName},'%')
+			</if>
+		</where>
+		ORDER BY a.update_time DESC, a.id ASC
+	</select>
+
 	<insert id="saveDetail">
 		INSERT INTO hlw_payment_detail(
 			payment_id,

+ 2 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/IHlwPaymentDetailService.java

@@ -62,4 +62,6 @@ public interface IHlwPaymentDetailService extends IService<HlwPaymentDetail> {
     Result<?> confirmPayment(JSONObject jsonObject);
 
     Result<?> serviceCheck(JSONObject jsonObject);
+
+    List<HlwPaymentDetail> getList(HlwPaymentDetail hlwPaymentDetail);
 }

+ 4 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentDetailServiceImpl.java

@@ -77,6 +77,10 @@ public class HlwPaymentDetailServiceImpl extends ServiceImpl<HlwPaymentDetailMap
         return page.setRecords(baseMapper.findList(page, hlwPaymentDetail, queryWrapper));
     }
 
+    @Override
+    public List<HlwPaymentDetail> getList(HlwPaymentDetail hlwPaymentDetail) {
+        return baseMapper.getList(hlwPaymentDetail);
+    }
 
     @Override
     public Page<HlwPaymentDetail> pageUserBusinessInfoList(Page<HlwPaymentDetail> page, HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper) {