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-07-16 14:53:29 +08:00
parent 94a23560e1
commit 0458846556
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,7 @@ 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.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType = 'ProductDefaultObject' and O.PhaseType='1010' and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') and O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
//sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.objectNo,fl.taskNo,ft.serialNo,cpt.CUSTOMER_NAME,cpt.CUSTOMER_NAME AS CUSTOMERNAME,ci.customertype,ci.certtype,lpi.project_no AS FlowKey,bo.proj_id AS projectId,lpi.SUBJECTID,ps.leasform,lpi.CAR_TYPE AS carAttributes,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,O.SERIALNO,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.flow_unid AS flowUnid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN flow_log fl ON fl.flowunid=ft.objectno LEFT JOIN PRD_SPECIFIC_LIBRARY ps ON ps.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
@ -309,7 +309,7 @@ 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.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType = 'ProductDefaultObject' and O.PhaseType='1020' and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') and O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();
@ -326,7 +326,7 @@ 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.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType = 'ProductDefaultObject' and O.PhaseType='1040' and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') and O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType = 'ProductDefaultObject' and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply') and O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();