发票管理

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwinvoice/mapper/xml/HlwInvoiceMapper.xml

@@ -39,7 +39,8 @@
 		ha.file_path_prefix as "filePathPrefix",
 		hp.payment_code AS "paymentCode"
         FROM hlw_invoice a
-		left join hlw_payment hp on hp.invoice_id=a.id
+		left join  hlw_subcontractor_account_flow hsf on hsf.invoice_id=a.id
+		left join hlw_payment hp on hp.id=hsf.payment_id
 		left join hlw_application_setting ha on ha.id=hp.application_id
 		left join hlw_company hc on hc.id=hp.company_id
 		inner join hlw_cp_setting hce

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/controller/HlwSubcontractorAccountFlowController.java

@@ -211,6 +211,29 @@ public class HlwSubcontractorAccountFlowController extends JeecgController<HlwSu
 	 }
 
 
+
+	 /**
+	  * 发票明细
+	  *
+	  * @param hlwSubcontractorAccountFlow
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "付款信息表-分页列表查询")
+	 @ApiOperation(value = "付款信息表-分页列表查询", notes = "付款信息表-分页列表查询")
+	 @GetMapping(value = "/invoiceDetailsList")
+	 public Result<?> invoiceDetailsList(HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow,
+										 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+										 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+										 HttpServletRequest req) {
+		 QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlwSubcontractorAccountFlow, req.getParameterMap());
+		 Page<HlwSubcontractorAccountFlow> page = new Page<HlwSubcontractorAccountFlow>(pageNo, pageSize);
+		 Page<HlwSubcontractorAccountFlow> pageList = hlwSubcontractorAccountFlowService.invoiceDetailsList(page, hlwSubcontractorAccountFlow, queryWrapper);
+		 return Result.ok(pageList);
+	 }
+
 	
 	/**
 	 *   添加

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/HlwSubcontractorAccountFlowMapper.java

@@ -26,4 +26,6 @@ public interface HlwSubcontractorAccountFlowMapper extends BaseMapper<HlwSubcont
     List<HlwSubcontractorAccountFlow> invoicePaymentApplyList(Page<HlwSubcontractorAccountFlow> page, @Param("hlwSubcontractorAccountFlow")HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, @Param(Constants.WRAPPER)QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 
     HlwSubcontractorAccountFlow getHlwSubcontractorAccountFlowById(Integer id);
+
+    List<HlwSubcontractorAccountFlow> invoiceDetailsList(Page<HlwSubcontractorAccountFlow> page,@Param("hlwSubcontractorAccountFlow") HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow,@Param(Constants.WRAPPER) QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorAccountFlowMapper.xml

@@ -275,5 +275,23 @@
 		inner join hlw_cp_setting hce
 		left join hlw_subcontractor hs on hs.id=hp.subcontractor_id
 		WHERE a.id = #{id}
+		group by a.id
 	</select>
+
+
+    <select id="invoiceDetailsList" resultType="org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractorAccountFlow" >
+        SELECT
+        a.id AS "id",
+        ha.application_name AS "applicationName",
+        hp.payment_code AS "paymentCode",
+        (a.amount+a.service_fee) AS "totalPayment"
+        FROM hlw_subcontractor_account_flow a
+        left join hlw_payment hp on a.payment_id=hp.id
+        left join hlw_application_setting ha on ha.id=hp.application_id
+        <where>
+            a.invoice_id=#{hlwSubcontractorAccountFlow.invoiceId}
+        </where>
+        group by a.id
+        order by a.update_time desc ,a.id asc
+    </select>
 </mapper>

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/IHlwSubcontractorAccountFlowService.java

@@ -24,4 +24,6 @@ public interface IHlwSubcontractorAccountFlowService extends IService<HlwSubcont
     Page<HlwSubcontractorAccountFlow> invoicePaymentApplyList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 
     HlwSubcontractorAccountFlow getHlwSubcontractorAccountFlowById(Integer integer);
+
+    Page<HlwSubcontractorAccountFlow> invoiceDetailsList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/impl/HlwSubcontractorAccountFlowServiceImpl.java

@@ -46,4 +46,9 @@ public class HlwSubcontractorAccountFlowServiceImpl extends ServiceImpl<HlwSubco
     public HlwSubcontractorAccountFlow getHlwSubcontractorAccountFlowById(Integer id) {
         return baseMapper.getHlwSubcontractorAccountFlowById(id);
     }
+
+    @Override
+    public Page<HlwSubcontractorAccountFlow> invoiceDetailsList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper) {
+        return page.setRecords(baseMapper.invoiceDetailsList(page, hlwSubcontractorAccountFlow, queryWrapper));
+    }
 }