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

APP邮寄归档增加档案邮寄时间#逾期提醒逾期金额修改

Browse Source
This commit is contained in:
zhangjun 2020-09-01 18:40:43 +08:00
parent aa318e513a
commit 480300d5e3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
ASUser asUser = new ASUser(userId);
String orgID = asUser.getOrgID();
String sql = "";
sql = "select EXPNUMBER,EXPCOMPANY,FLOWUNID from LB_FILE_MAILARCHIVING_INFO_TEMP where FLOWUNID='"+flowunid+"' ";
sql = "select EXPNUMBER,EXPCOMPANY,EXPSTRATDATE,FLOWUNID from LB_FILE_MAILARCHIVING_INFO_TEMP where FLOWUNID='"+flowunid+"' ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();
@ -111,6 +111,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
cat.setAttributeValue("updatetime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss"));
cat.setAttributeValue("EXPNUMBER", fieldMap.get("EXPNUMBER") == null ? "" : fieldMap.get("EXPNUMBER").toString());
cat.setAttributeValue("EXPCOMPANY", fieldMap.get("EXPCOMPANY") == null ? "" : fieldMap.get("EXPCOMPANY").toString());
cat.setAttributeValue("EXPSTRATDATE", fieldMap.get("EXPSTRATDATE") == null ? "" : fieldMap.get("EXPSTRATDATE").toString());
catManage.saveObject(cat);
}
@ -269,7 +270,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
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 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 lul.customer_id='"+customerid+"' GROUP BY lci.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 lul.customer_id='"+customerid+"' GROUP BY lci.id ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();

10
src_sql/投产SQL/v20200915/zhj_20200915.sql
View File

@ -6,4 +6,14 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('cash_type','δ½áÇå','δ»¹','','0020','1','','','','','','','','','','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','','');
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('cash_type','ÒѽáÇå','已还','','0010','1','','','','','','','','','','','','SYS_Designer',null,'2020/08/14 18:18:57','SYS_Designer','2020/08/14 18:18:57','','');
-- 新增档案时间
ALTER TABLE LB_FILE_MAILARCHIVING_INFO_TEMP ADD EXPSTRATDATE VARCHAR(32) DEFAULT NULL COMMENT '档案邮寄时间';
-- APP邮寄信息页签新增字段档案邮寄时间
delete from awe_do_library where dono='MailingList' and colindex='0145';
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('MailingList','0145','0088','1','O','EXPSTRATDATE','EXPSTRATDATE','String','','档案邮寄时间','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','','','SYS_Designer','2020/09/01 17:30:20','SYS_Designer','2020/09/01 17:30:44','','','1','','','','');
-- 档案邮寄模板增加字段
delete from APP_BUSINESS_TEMPLATE where GROUP_CODE='MailingList' and COLINDEX='0145';
insert into `APP_BUSINESS_TEMPLATE` (`GROUP_CODE`, `DONO`, `COLINDEX`, `SORTNO`, `COLNAME`, `DATA_NAME`, `DATA_CODE`, `ISLIST`, `ISSHOW`, `DATA_POSITION`) values('MailingList','MailingList','0145','0088','EXPSTRATDATE','档案邮寄时间','EXPSTRATDATE','N','Y','88');