接口调整

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

@@ -41,6 +41,8 @@ public class ProjectDto extends PageParam {
 
     private String userId;
 
+    private Integer isRelContract;
+
 
 
 }

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

@@ -10,6 +10,7 @@ import com.zjugis.framework.common.pojo.CommonResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -49,7 +50,7 @@ public class ContractInvoiceController {
 
 
     @GetMapping("/contractInovoice/process")
-    public CommonResult<String> process(String contractId) {
+    public CommonResult<String> process(@RequestParam("contractId") String contractId) {
         String url = contractInvoiceService.process(contractId);
         return CommonResult.success(url);
     }

zjugis-business/src/main/java/com/zjugis/business/flow/project/controller/FlowProjectController.java

@@ -43,6 +43,7 @@ public class FlowProjectController extends BaseController {
 
     @PostMapping("/page")
     public String page(@ParamModel ProjectDto project, long page, long rows) {
+        project.setIsRelContract(0);
         Page<Project> p = projectService.page(new Page<>(page, rows), project);
         Grid<Project> grid = new Grid(
                 p.getCurrent(),

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

@@ -22,8 +22,14 @@
     </select>
 
     <select id="page" resultType="com.zjugis.business.bean.entity.Project">
-        SELECT P.*,C.CONTRACT_AMOUNT as outputValue ,C.CONTRACT_NUMBER as contractNumber FROM PROJECT P
-        LEFT JOIN CONTRACT C ON C.PROJECT_ID = P.ID AND C.FLOW_STATUS in (90,99)
+        SELECT P.*
+        <if test="params != null and params.isRelContract != null and params.isRelContract == 1">
+            ,C.CONTRACT_AMOUNT as outputValue,C.CONTRACT_NUMBER as contractNumber
+        </if>
+        FROM PROJECT P
+        <if test="params != null and params.isRelContract != null and params.isRelContract == 1">
+            LEFT JOIN CONTRACT C ON C.PROJECT_ID = P.ID AND C.FLOW_STATUS in (90,99)
+        </if>
         <if test="params != null and params.userId != null  and params.userId != ''">
             LEFT JOIN PROJECT_WORKER_RELATION PW ON PW.PROJECT_ID = P.ID
         </if>