xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

dev
徐杰盟 2025-03-08 16:55:57 +08:00
parent 0413098c53
commit a46d2dc281
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java
View File

@ -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)));
}
/**

7
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java
View File

@ -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<Record> find(PageParam pp, String name, String create_id, String type, String stm, String etm) {
public Page<Record> 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<Object> 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);

3
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java
View File

@ -32,7 +32,8 @@ public class CustomerContractSignedLogService extends BaseService {
public static final CustomerContractSignedLogService me = new CustomerContractSignedLogService();
public Page<Record> 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 " +