anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#修改逾期合同列表，#修改审批进度流程查询接口流程名排序#接口日志修改

Browse Source
This commit is contained in:
zhangjun 2020-08-13 13:46:10 +08:00
parent 68e77cc9ab
commit 5e6de6ecdf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java
View File

@ -35,7 +35,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/get/number" + " run .................");
try {
@ -73,7 +73,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/get/contractRepealnumber" + " run .................");
try {
@ -94,7 +94,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/generate/contract" + " run .................");
try {
@ -114,7 +114,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/get/templatenumber" + " run .................");
try {
@ -134,7 +134,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/initiate/sign" + " run .................");
try {
@ -154,7 +154,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/sendMessage/again" + " run .................");
try {
@ -174,7 +174,7 @@ public class ContractMakeController {
@Context Transaction sqlca) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] BusinessDataController run .................");
.info("[CONTROLLER] ContractMakeController run .................");
ARE.getLog().info(
"[Path] /contract/make/query/again" + " run .................");
try {

6
src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java
View File

@ -266,7 +266,8 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
String customerid = fieldMap.get("customer_id") == null ? "" : fieldMap.get("customer_id").toString();
String sql = "";
//sql = "select lrp.contract_id,lci.contract_number,lul.customer_name as lessee_name,lec.frame_number,lec.model,ifnull(sum(lrp.rent),0) - ifnull(sum(lri.rent),0) as residue_rent,lrp.rent,lcc.defaultdueday,lcc.lease_term,lrp.plan_list,lrp.penalty from lb_contract_info lci left join lc_calc_condition lcc on lcc.contract_id = lci.id left join lb_union_lessee lul on lcc.contract_id = lul.contract_id and lul.is_main = 'y' left join lb_equipment_car lec on lec.contract_id = lcc.contract_id left join lc_rent_plan lrp on lrp.contract_id=lci.id left join lc_rent_income lri on lri.plan_id=lrp.id where lul.customer_id='"+customerid+"' group by lrp.contract_id ";
sql = "SELECT lrp.project_plan_number as plannumber,'project_plan_number' AS planCName,lul.flowunid as objectNo,lrp.contract_id,lrp.contract_plan_number AS contract_number,lul.customer_name AS lessee_name,lec.frame_number,lec.model,lrp.overinterest AS residue_rent,lrp.rent,SUBSTRING(lrp.plan_date,-2) AS defaultdueday,lcc.lease_term,COUNT(*) AS plan_list,SUM(lrp.penalty) AS penalty,ldcl.filename AS filename,ldcl.attribute_id AS fileId FROM lc_overdue_rent_plan lrp LEFT JOIN lb_union_lessee lul ON lul.contract_id=lrp.contract_id AND lul.is_main = 'y' LEFT JOIN lb_equipment_car lec ON lec.contract_id = lrp.contract_id LEFT JOIN lc_calc_condition lcc ON lcc.contract_id = lrp.contract_id LEFT JOIN lb_doc_contract_list ldcl ON ldcl.contract_id=lrp.contract_id AND ldcl.file_flag='yes' WHERE plan_status='δ½áÇå' AND lul.customer_id='"+customerid+"' GROUP BY lrp.contract_id ";
//sql = "SELECT lrp.project_plan_number as plannumber,'project_plan_number' AS planCName,lul.flowunid as objectNo,lrp.contract_id,lrp.contract_plan_number AS contract_number,lul.customer_name AS lessee_name,lec.frame_number,lec.model,lrp.overinterest AS residue_rent,lrp.rent,SUBSTRING(lrp.plan_date,-2) AS defaultdueday,lcc.lease_term,COUNT(*) AS plan_list,SUM(lrp.penalty) AS penalty,ldcl.filename AS filename,ldcl.attribute_id AS fileId FROM lc_overdue_rent_plan lrp LEFT JOIN lb_union_lessee lul ON lul.contract_id=lrp.contract_id AND lul.is_main = 'y' LEFT JOIN lb_equipment_car lec ON lec.contract_id = lrp.contract_id LEFT JOIN lc_calc_condition lcc ON lcc.contract_id = lrp.contract_id LEFT JOIN lb_doc_contract_list ldcl ON ldcl.contract_id=lrp.contract_id AND ldcl.file_flag='yes' WHERE plan_status='δ½áÇå' AND lul.customer_id='"+customerid+"' GROUP BY lrp.contract_id ";
sql= "SELECT lci.id AS contract_id,lci.contract_number,lul.flowunid AS objectNo,lul.lessee_name,lec.frame_number,lec.model,IFNULL(lrp.rent,0) - IFNULL(lri.rent,0) AS residue_rent,lor.rent,lor.defaultdueday,lcc.lease_term,lor.plan_list,IFNULL(lcrl.rent,0)- IFNULL(lri.rent,0) + IFNULL(lor.penalty,0) AS penalty,lor.plannumber,lor.planCName,ld.filename,ld.fileId FROM lb_contract_info lci LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_plan GROUP BY contract_id) lrp ON lrp.contract_id = lci.id LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_income GROUP BY contract_id) lri ON lri.contract_id = lci.id LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_plan WHERE DATE_FORMAT(NOW(),'%Y/%m/%d')<plan_date GROUP BY contract_id ) lcrl ON lcrl.contract_id = lci.id LEFT JOIN (SELECT project_plan_number AS plannumber,'project_plan_number' AS planCName,contract_plan_number AS contract_number,contract_id,SUBSTRING(plan_date,-2) AS defaultdueday,rent,plan_date,plan_status,COUNT(*) AS plan_list,SUM(penalty) - SUM(fact_penalty) AS penalty FROM lc_overdue_rent_plan WHERE plan_status='δ½áÇå' GROUP BY contract_id) lor ON lor.contract_id = lrp.contract_id LEFT JOIN (SELECT contract_id,plan_date FROM lc_rent_plan GROUP BY contract_id) lcr ON lcr.contract_id=lci.id LEFT JOIN (SELECT customer_name AS lessee_name,contract_id,is_main,customer_id,flowunid FROM lb_union_lessee WHERE is_main = 'y' GROUP BY contract_id) lul ON lul.contract_id=lci.id LEFT JOIN (SELECT frame_number,model,contract_id FROM lb_equipment_car GROUP BY contract_id) lec ON lec.contract_id = lci.id LEFT JOIN (SELECT lease_term,contract_id FROM lc_calc_condition GROUP BY contract_id) lcc ON lcc.contract_id = lci.id LEFT JOIN (SELECT contract_id,file_flag,filename AS filename,attribute_id AS fileId FROM lb_doc_contract_list WHERE file_flag='yes' GROUP BY contract_id) ld ON ld.contract_id=lci.id WHERE DATE_FORMAT(NOW(), '%Y') < lcr.plan_date AND lul.customer_id='"+customerid+"' GROUP BY lci.id ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();
@ -319,7 +320,8 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
fieldMap = (Map<String, Object>) testMap.get("fieldMap");
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
String sql = "";
sql = "SELECT O.FLOWNAME,O.ObjectType,O.PhaseType,O.ApplyType FROM FLOW_OBJECT O WHERE O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' GROUP BY O.ApplyType ";
//sql = "SELECT O.FLOWNAME,O.ObjectType,O.PhaseType,O.ApplyType FROM FLOW_OBJECT O WHERE O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' GROUP BY O.ApplyType ";
sql= "SELECT O.flowno,O.flowname,O.FLOWTYPE AS ObjectType FROM FLOW_CATALOG O WHERE O.FLOWTYPE IN ('BusinessApplyApply','BusinessChangeApply','BusinessCancelApply','BContractApproveApply','BContractChangeApply','BContractCancelApply','FundPaymentCarApply','MortgageFileApply','MortgageFileMailApply') ORDER BY FIELD(ObjectType,'BusinessApplyApply','BusinessChangeApply','BusinessCancelApply','BContractApproveApply','BContractChangeApply','BContractCancelApply','FundPaymentCarApply','MortgageFileApply','MortgageFileMailApply'); ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();
body.put("datas", dataList);