开票查询

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractInvoiceDto.java

@@ -21,18 +21,10 @@ public class ContractInvoiceDto extends PageParam {
 
     private String contractId;
 
-
-    /**
-     * 合同编号
-     */
-    private String contractNumber;
-
     private String invoiceNumber;
 
     private String contractName;
 
-    private String zrbmId;
-
     private String xmmc;
 
     private Integer flowStatus;

zjugis-business/src/main/java/com/zjugis/business/controller/ContractInvoiceController.java

@@ -36,8 +36,8 @@ public class ContractInvoiceController {
      *
      * @return 所有数据
      */
-    @GetMapping("/contractInvoice/page")
-    public CommonResult<Page<ContractInvoiceResponse>> page(ContractInvoiceDto contractInvoiceDto) {
+    @PostMapping("/contractInvoice/page")
+    public CommonResult<Page<ContractInvoiceResponse>> page(@RequestBody ContractInvoiceDto contractInvoiceDto) {
         return CommonResult.success(contractInvoiceService.page(new Page<>(contractInvoiceDto.getPageNo(),contractInvoiceDto.getPageSize()), contractInvoiceDto));
     }
     /**

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectWorkerRelationServiceImpl.java

@@ -152,6 +152,7 @@ public class ProjectWorkerRelationServiceImpl implements ProjectWorkerRelationSe
         QueryWrapper<ProjectWorkerRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("PROJECT_ID",projectId);
         queryWrapper.eq("STATE",ProjectWorkerConstants.PROJECT_WORKER_BIND);
+        queryWrapper.orderByDesc("IS_MANAGER");
         List<ProjectWorkerRelation> projectWorkerRelations = projectWorkerRelationMapper.selectList(queryWrapper);
         List<String> ids = projectWorkerRelations.stream().map(ProjectWorkerRelation::getWorkerId).collect(Collectors.toList());
         CommonResult<List<AdminUserRespDTO>> result = adminUserApi.getUsers(ids);

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -2,14 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zjugis.business.mapper.ContractInvoiceMapper">
     <select id="page" resultType="com.zjugis.business.bean.response.ContractInvoiceResponse">
-        SELECT T.*,T1.CONTRACT_NUMBER AS contractNumber,T1.NAME,T2.XMMC,T2.XMBH,t3.maxd as returnDate,U.NICKNAME AS XSRY,T2.ZRBM
+        SELECT T.*,T1.CONTRACT_NUMBER AS contractNumber,T1.NAME,T2.XMMC,T2.XMBH,t3.maxd as returnDate,U.NICKNAME AS XSRY,D.NAME as ZRBM
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
         LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T3 ON T3.CONTRACT_INVOICE_ID=T.ID
         <where>
-            T.ISVALID = 1 AND T.FLOW_STATUS &gt;= 90
+            T.ISVALID = 1
             <if test="params != null and params.deptId != null and params.deptId != ''">
                 AND T2.ZRBM_ID = #{params.deptId}
             </if>
@@ -27,9 +28,6 @@
                 <bind name="contractName" value="'%'+params.contractName+'%'"/>
                 AND T1.NAME like #{contractName}
             </if>
-            <if test="params != null and params.zrbmId != null and params.zrbmId != ''">
-                AND T2.ZRBM_ID = #{params.zrbmId,jdbcType=VARCHAR}
-            </if>
             <if test="params != null and params.xmmc != null and params.xmmc != ''">
                 <bind name="xmmc" value="'%'+params.xmmc+'%'"/>
                 AND T2.XMMC like #{xmmc}
@@ -37,6 +35,9 @@
             <if test="params != null and params.flowStatus != null">
                 AND T.FLOW_STATUS = #{params.flowStatus,jdbcType=INTEGER}
             </if>
+            <if test="params != null and params.flowStatus == null">
+                AND T.FLOW_STATUS &gt;= 90
+            </if>
             <if test="params != null and params.payCompanyId != null and params.payCompanyId != ''">
                 AND T.PAY_COMPANY_ID = #{params.payCompanyId,jdbcType=VARCHAR}
             </if>