From a46d2dc28186c3f752aefb4c2c18868a847224ff Mon Sep 17 00:00:00 2001 From: xjm Date: Sat, 8 Mar 2025 16:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractsigned/CustomerContractSignedController.java | 5 +++-- .../contractsigned/CustomerContractSignedService.java | 7 ++++++- .../CustomerContractSignedLogService.java | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java index fb34837..ee969fd 100644 --- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java +++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java @@ -129,9 +129,10 @@ public class CustomerContractSignedController extends Controller { String create_id = get("create_id"); String stm = get("stm"); String etm = get("etm"); - String type = get("type","0"); + String type = get("type"); + String del = get("del","0"); - renderJson(Result.object(CustomerContractSignedService.me.find(pp, name, create_id,type, stm, etm))); + renderJson(Result.object(CustomerContractSignedService.me.find(pp, name, create_id,type,del, stm, etm))); } /** diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java index 4d2f44b..78d14d8 100644 --- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java +++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java @@ -34,7 +34,7 @@ public class CustomerContractSignedService extends BaseService { private static final Log log = Log.getLog(CustomerContractSignedService.class); public static final CustomerContractSignedService me = new CustomerContractSignedService(); - public Page find(PageParam pp, String name, String create_id, String type, String stm, String etm) { + public Page find(PageParam pp, String name, String create_id, String type, String del, String stm, String etm) { String selectsql = "select t.* "; String fromsql = "from customer_contract_signed t where 1=1 "; List paraList = new ArrayList<>(); @@ -53,6 +53,11 @@ public class CustomerContractSignedService extends BaseService { paraList.add(type.trim()); } + if (StrKit.notBlank(del)) { + fromsql += " and t.del = ? \n"; + paraList.add(del.trim()); + } + if (StrKit.notBlank(stm)) { fromsql += " and t.create_time >= ? \n"; paraList.add(stm); diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java index 6e9d602..1853503 100644 --- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java +++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java @@ -32,7 +32,8 @@ public class CustomerContractSignedLogService extends BaseService { public static final CustomerContractSignedLogService me = new CustomerContractSignedLogService(); public Page find(PageParam pp, String userName, String company_name, String client_name, String stm, String etm) { - String selectsql = "select t.*, c.template_name, c.name company_name, c.name client_name "; + String selectsql = "select t.*, c.template_name, " + + " s1.name company_name,s1.attachment company_attachment, s2.name client_name , s2.attachment client_attachment "; String fromsql = "from customer_contract_signed_log t" + " left join customer_contract_template c on t.contract_id = c.id " + " left join customer_contract_signed s1 on t.company_signed_id = s1.id " +