监管页面自由职业者

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

@@ -120,6 +120,33 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
 
 
 
+
+    /**
+     * 分页列表查询自由职业者业务明细
+     *
+     * @param hlwPaymentDetail
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "自由职业者业务明细")
+    @ApiOperation(value = "自由职业者业务明细", notes = "自由职业者业务明细")
+    @GetMapping(value = "/businessDetailsList")
+    public Result<?> businessDetailsList(HlwPaymentDetail hlwPaymentDetail,
+                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                          HttpServletRequest req) {
+        QueryWrapper<HlwPaymentDetail> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlwPaymentDetail, req.getParameterMap());
+        Page<HlwPaymentDetail> page = new Page<HlwPaymentDetail>(pageNo, pageSize);
+        Page<HlwPaymentDetail> pageList = hlwPaymentDetailService.businessDetailsList(page, hlwPaymentDetail, queryWrapper);
+        return Result.ok(pageList);
+    }
+
+
+
+
+
     /**
      * 添加
      *

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

@@ -22,4 +22,6 @@ public interface HlwPaymentDetailMapper extends BaseMapper<HlwPaymentDetail> {
     List<HlwPaymentDetail> pageUserBusinessInfoList(Page<HlwPaymentDetail> page, @Param("hlwPaymentDetail")HlwPaymentDetail hlwPaymentDetail, @Param(Constants.WRAPPER)QueryWrapper<HlwPaymentDetail> queryWrapper);
 
     List<HlwPaymentDetail> findUserBusinessInfoListForMoney(@Param("hlwPaymentDetail")HlwPaymentDetail hlwPaymentDetail,@Param(Constants.WRAPPER) QueryWrapper<HlwPaymentDetail> queryWrapper);
+
+    List<HlwPaymentDetail> businessDetailsList(Page<HlwPaymentDetail> page, @Param("hlwPaymentDetail")HlwPaymentDetail hlwPaymentDetail, @Param(Constants.WRAPPER)QueryWrapper<HlwPaymentDetail> queryWrapper);
 }

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

@@ -235,4 +235,37 @@
 		having a.create_time=max(a.create_time)
 		ORDER BY personalNetPayment DESC, paymentNumber DESC
 	</select>
+
+
+
+	<!--自由职业者业务明细-->
+	<select id="businessDetailsList" resultType="org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail" >
+		SELECT
+		a.id AS "id",
+		a.bnkflg AS "bnkflg",
+		a.eacbnk AS "eacbnk",
+		a.card_number AS "cardNumber",
+		a.rcveaa AS "rcveaa",
+		a.tax_fee AS "taxFee",
+		a.net_payment AS "netPayment",
+		a.payment_result_time AS "paymentResultTime",
+		a.duty_paid_id AS "dutyPaidId"
+		hi.invoice as "invoice",
+        hd.tax_payment_receipt as "taxPaymentReceipt",
+		hr.id as "requirementId",
+		hr.name as "requirementName"
+		FROM hlw_payment_detail a
+		left join hlw_payment hp on hp.id=a.payment_id
+		left join hlw_invoice hi on hi.id=hp.invoice_id
+		left join hlw_duty_paid hd on hd.id=a.duty_paid_id
+		left join hlw_order ho on ho.id=hp.order_id
+		left join hlw_requirement hr on hr.id=ho.requirement_id
+		<where>
+			a.status=3
+			<if test="hlwPaymentDetail.paymentResultTime_begin != null and hlwPaymentDetail.paymentResultTime_begin !=''">
+				and a.payment_result_time between #{hlwPaymentDetail.paymentResultTime_begin} and #{hlwPaymentDetail.paymentResultTime_end}
+			</if>
+		</where>
+		ORDER BY a.update_time DESC, a.id asc
+	</select>
 </mapper>

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

@@ -20,4 +20,6 @@ public interface IHlwPaymentDetailService extends IService<HlwPaymentDetail> {
     Page<HlwPaymentDetail> pageUserBusinessInfoList(Page<HlwPaymentDetail> page, HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper);
 
     List<HlwPaymentDetail> findUserBusinessInfoListForMoney(HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper);
+
+    Page<HlwPaymentDetail> businessDetailsList(Page<HlwPaymentDetail> page, HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper);
 }

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

@@ -35,4 +35,9 @@ public class HlwPaymentDetailServiceImpl extends ServiceImpl<HlwPaymentDetailMap
     public List<HlwPaymentDetail> findUserBusinessInfoListForMoney(HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper) {
         return baseMapper.findUserBusinessInfoListForMoney(hlwPaymentDetail,queryWrapper);
     }
+
+    @Override
+    public Page<HlwPaymentDetail> businessDetailsList(Page<HlwPaymentDetail> page, HlwPaymentDetail hlwPaymentDetail, QueryWrapper<HlwPaymentDetail> queryWrapper) {
+        return page.setRecords(baseMapper.businessDetailsList(page, hlwPaymentDetail, queryWrapper));
+    }
 }