调整OA单据

src/main/java/com/uas/core/support/SpringDynamicCronTask.java

@@ -52,7 +52,7 @@ public class SpringDynamicCronTask implements SchedulingConfigurer {
 					e.printStackTrace();
 				}
 			}, env.getProperty("Task.NotifyCron"));
-			/*taskRegistrar.addCronTask(() -> {
+			taskRegistrar.addCronTask(() -> {
 				//业务逻辑
 				try {
 					Method method = scheduleTask.getClass().getMethod(env.getProperty("Task.SENDYCSQMethod"));
@@ -78,7 +78,7 @@ public class SpringDynamicCronTask implements SchedulingConfigurer {
 				}catch (Exception e){
 					e.printStackTrace();
 				}
-			}, env.getProperty("Task.SENDHTSPCron"));*/
+			}, env.getProperty("Task.SENDHTSPCron"));
 		}
 	}
 }

src/main/java/com/uas/service/Impl/ISegHetongServiceImpl.java

@@ -82,9 +82,9 @@ public class ISegHetongServiceImpl implements ISegHetongService {
         try {
             SqlRowList rs;
             if (id==0){
-                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_recorder,ct_varchar50_3,ct_varchar50_4,ct_varchar50_6,ct_varchar50_5,ct_varchar50_7,ct_varchar50_8,ct_varchar50_9,ct_varchar50_10,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_varchar50_17,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,to_char(ct_date_2,'yyyy-MM-dd HH24:mi:ss') ct_date_2,ct_varchar50_18,ct_varchar50_19,ct_varchar50_20,ct_varchar500_1,ct_varchar500_2,ct_varchar500_3,ct_varchar500_4,ct_varchar500_5 from customtable left join employee on ct_recorder=em_name where ct_caller='HTSP' and ct_status='已审核' and ct_sendstatus='待上传'");
+                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_recorder,ct_varchar50_3,ct_varchar50_4,ct_varchar50_6,ct_varchar50_5,ct_varchar50_7,ct_varchar50_8,ct_varchar50_9,ct_varchar50_10,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_varchar50_17,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,to_char(ct_date_2,'yyyy-MM-dd HH24:mi:ss') ct_date_2,ct_varchar50_18,ct_varchar50_19,ct_varchar50_20,ct_varchar500_1,ct_varchar500_2,ct_varchar50_30,ct_varchar500_4,ct_varchar500_5 from customtable left join employee on ct_recorder=em_name where ct_caller='HTSP' and ct_sendstatus='待上传' and em_islandray=-1");
             }else {
-                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_recorder,ct_varchar50_3,ct_varchar50_4,ct_varchar50_6,ct_varchar50_5,ct_varchar50_7,ct_varchar50_8,ct_varchar50_9,ct_varchar50_10,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_varchar50_17,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,to_char(ct_date_2,'yyyy-MM-dd HH24:mi:ss') ct_date_2,ct_varchar50_18,ct_varchar50_19,ct_varchar50_20,ct_varchar500_1,ct_varchar500_2,ct_varchar500_3,ct_varchar500_4,ct_varchar500_5 from customtable left join employee on ct_recorder=em_name where ct_caller='HTSP' and ct_status='已审核' and ct_sendstatus='待上传' and ct_id="+id);
+                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_recorder,ct_varchar50_3,ct_varchar50_4,ct_varchar50_6,ct_varchar50_5,ct_varchar50_7,ct_varchar50_8,ct_varchar50_9,ct_varchar50_10,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_varchar50_17,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,to_char(ct_date_2,'yyyy-MM-dd HH24:mi:ss') ct_date_2,ct_varchar50_18,ct_varchar50_19,ct_varchar50_20,ct_varchar500_1,ct_varchar500_2,ct_varchar50_30,ct_varchar500_4,ct_varchar500_5 from customtable left join employee on ct_recorder=em_name where ct_caller='HTSP' and ct_status='已审核' and ct_sendstatus='待上传' and em_islandray=-1 and ct_id="+id);
             }
             while (rs.next()) {
                 SegHetongParamterForm form = new SegHetongParamterForm();
@@ -106,15 +106,19 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                 /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");*/
                 JSONObject json = new JSONObject();
                 json.put("fd_3752c2c04a75a0","深圳深爱半导体股份有限公司");
-                json.put("fd_3604de30e24a0c",rs.getString("ct_varchar50_2"));
                 String recorder = rs.getString("ct_recorder");
+                JSONObject object = new JSONObject();
+                JSONObject person = new JSONObject();
                 if (recorder!=null&&!"".equals(recorder)){
-                    Object data = baseDao.getFieldDataByCondition("employee", "em_code",
-                            "em_name='" + recorder + "'");
-                    json.put("fd_3604de42ba7844",data.toString());
+                    Object[] employees = baseDao.getFieldsDataByCondition("employee", "em_code,em_departmentcode", "em_name" + "='" + recorder + "'");
+                    object.put("DeptNo",employees[1].toString());
+                    person.put("PersonNo",employees[0].toString());
                 }else {
-                    json.put("fd_3604de42ba7844","");
+                    object.put("DeptNo","");
+                    person.put("PersonNo","");
                 }
+                json.put("fd_3604de30e24a0c",object);
+                json.put("fd_3604de42ba7844",person);
                 json.put("fd_35ea2f8a12e36c",rs.getString("ct_varchar50_3"));
                 json.put("fd_35ea2f2e32100c",rs.getString("ct_varchar50_4"));
                 json.put("fd_3604df162c55b2",rs.getString("ct_varchar50_6"));
@@ -128,7 +132,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                         attachmentForms.add(att);
                     }
                 }
-                json.put("fd_3604deeda0668c",varchar505);
+                /*json.put("fd_3604deeda0668c",varchar505);*/
                 String varchar507 = rs.getString("ct_varchar50_7");
                 if (varchar507!=null&&!"".equals(varchar507)){
                     String[] idArr = varchar507.split(";");
@@ -139,7 +143,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                         attachmentForms.add(att);
                     }
                 }
-                json.put("fd_3604e51f9942c0",varchar507);
+                /*json.put("fd_3604e51f9942c0",varchar507);*/
                 json.put("fd_35ea303e59fa06",rs.getInt("ct_varchar50_8"));
                 json.put("fd_35ea303f3e3710",rs.getInt("ct_varchar50_9"));
                 json.put("fd_35ea307c1afc98",rs.getGeneralDouble("ct_varchar50_10"));
@@ -148,7 +152,7 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                 json.put("fd_35ea2f9f0398ae",rs.getString("ct_varchar50_14"));
                 json.put("fd_35ea3196e4ab8c",rs.getString("ct_varchar50_15"));
                 json.put("fd_35edd78f34436c",rs.getInt("ct_varchar50_16"));
-                json.put("fd_3604df88364ef0","");
+                /*json.put("fd_3604df88364ef0","");*/
                 json.put("fd_35ea30f7cdcf80",rs.getInt("ct_varchar50_17"));
                 json.put("fd_35ea3115974cca",rs.getString("ct_date_1"));
                 json.put("fd_35ea311de3f4b8",rs.getString("ct_date_2"));
@@ -158,13 +162,17 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                 json.put("fd_36b4e8424d4b96","");
                 json.put("fd_35ea32a0af1f7c",rs.getString("ct_varchar500_1"));
                 json.put("fd_35ea32ba35b07a",rs.getString("ct_varchar500_2"));
-                Object varchar5003 = rs.getObject("ct_varchar500_3");
+                Object varchar5003 = rs.getObject("ct_varchar50_30");
                 if (varchar5003==null){
                     json.put("fd_3752bcecf663a2",2);
                     json.put("fd_3604de4b0fd102","");
                 }else {
                     json.put("fd_3752bcecf663a2",1);
-                    json.put("fd_3604de4b0fd102",rs.getString("ct_varchar500_3"));
+                    Object data = baseDao.getFieldDataByCondition("employee", "em_code",
+                            "em_name='" + rs.getString("ct_varchar50_30") + "'");
+                    JSONObject personNo = new JSONObject();
+                    personNo.put("PersonNo",data.toString());
+                    json.put("fd_3604de4b0fd102",personNo);
                 }
                 String varchar5004 = rs.getString("ct_varchar500_4");
                 if (varchar5004!=null&&!"".equals(varchar5004)){
@@ -176,10 +184,10 @@ public class ISegHetongServiceImpl implements ISegHetongService {
                         attachmentForms.add(att);
                     }
                 }
-                json.put("fd_360e57c0bdabd0",varchar5004);
+                /*json.put("fd_360e57c0bdabd0",varchar5004);*/
                 json.put("fd_38b923bd38ba10",0);
                 json.put("fd_38d0cab88c490a",0);
-                json.put("fd_38d0cb38139850","");
+                /*json.put("fd_38d0cb38139850","");*/
                 SqlRowList rowSet = baseDao.queryForRowSet("select jn_name, jn_dealmanid, jn_dealmanname, jn_dealtime, " +
                         "jn_dealresult from jprocess left join jnode on jp_processinstanceid=jn_processinstanceid and jp_nodename=jn_name " +
                         "where jp_caller='HTSP' and jp_status='已审批' and jp_keyvalue=" + rs.getGeneralInt("ct_id"));
@@ -297,22 +305,22 @@ public class ISegHetongServiceImpl implements ISegHetongService {
 
     private JSONArray getFiles(String id) {
         JSONArray arr = new JSONArray();
-        JSONObject obj = null;
         for (String i : id.split(";")) {
             if (i != null && !i.trim().equals("")) {
                 SqlRowList rs = baseDao.queryForRowSet("SELECT * FROM FilePath WHERE fp_id=" + i);
-                if(rs.next()){
-                    JSONObject o = new JSONObject();
-                    o.put("fp_id", i);
-                    o.put("fp_path", rs.getString("fp_path"));
-                    o.put("fp_size", rs.getInt("fp_size"));
-                    o.put("fp_name", rs.getString("fp_name"));
-                    o.put("fp_date", rs.getGeneralTimestamp("fp_date"));
-                    o.put("fp_man", rs.getString("fp_man"));
-                }
-                if (obj != null) {
-                    arr.add(obj);
+                while (rs.next()){
+                    JSONObject obj=new JSONObject();
+                    obj.put("fp_id", i);
+                    obj.put("fp_path", rs.getString("fp_path"));
+                    obj.put("fp_size", rs.getInt("fp_size"));
+                    obj.put("fp_name", rs.getString("fp_name"));
+                    obj.put("fp_date", rs.getGeneralTimestamp("fp_date"));
+                    obj.put("fp_man", rs.getString("fp_man"));
+                    if (obj != null) {
+                        arr.add(obj);
+                    }
                 }
+
             }
         }
         return arr;

src/main/java/com/uas/service/Impl/KmReviewWebserviceServiceImpl.java

@@ -82,9 +82,9 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
         try {
             SqlRowList rs;
             if (id==0){
-                rs = baseDao.queryForRowSet("select va_id,em_code,em_departmentcode,va_employee,to_char(va_time,'yyyy-MM-dd HH24:mi:ss') va_time,to_char(va_endtime,'yyyy-MM-dd HH24:mi:ss') va_endtime,va_area,va_othername,va_driver,va_vecard,va_address,va_vecode,va_vetype from Vehicleapply left join employee on va_employee=em_name where va_sendstatus='待上传' and va_status='已审核'");
+                rs = baseDao.queryForRowSet("select va_id,em_code,em_departmentcode,va_employee,to_char(va_time,'yyyy-MM-dd HH24:mi:ss') va_time,to_char(va_endtime,'yyyy-MM-dd HH24:mi:ss') va_endtime,va_area,va_othername,va_driver,va_vecard,va_address,va_vecode,va_vetype from Vehicleapply left join employee on va_employee=em_name where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1");
             }else {
-                rs = baseDao.queryForRowSet("select va_id,em_code,em_departmentcode,va_employee,to_char(va_time,'yyyy-MM-dd HH24:mi:ss') va_time,to_char(va_endtime,'yyyy-MM-dd HH24:mi:ss') va_endtime,va_area,va_othername,va_driver,va_vecard,va_address,va_vecode,va_vetype from Vehicleapply left join employee on va_employee=em_name where va_sendstatus='待上传' and va_status='已审核' and va_id="+id);
+                rs = baseDao.queryForRowSet("select va_id,em_code,em_departmentcode,va_employee,to_char(va_time,'yyyy-MM-dd HH24:mi:ss') va_time,to_char(va_endtime,'yyyy-MM-dd HH24:mi:ss') va_endtime,va_area,va_othername,va_driver,va_vecard,va_address,va_vecode,va_vetype from Vehicleapply left join employee on va_employee=em_name where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1 and va_id="+id);
             }
             while (rs.next()) {
                 KmReviewParamterForm form = new KmReviewParamterForm();
@@ -103,20 +103,26 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
                 // 流程表单
                 /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");*/
                 JSONObject json = new JSONObject();
-                json.put("fd_3730d421cbfb0a",rs.getString("em_departmentcode"));
-                json.put("fd_3730d4225fbd78",rs.getString("em_code"));
+                JSONObject object = new JSONObject();
+                object.put("DeptNo",rs.getString("em_departmentcode"));
+                json.put("fd_3730d421cbfb0a",object);
+                JSONObject personNo = new JSONObject();
+                personNo.put("PersonNo",rs.getString("em_code"));
+                json.put("fd_3730d4225fbd78",personNo);
                 json.put("fd_3730d4352f148c",rs.getString("va_time"));
                 json.put("fd_3730d441a0c6c8",rs.getString("va_endtime"));
                 json.put("fd_3730d41ece1a68",rs.getString("va_area"));
                 json.put("fd_3730d45920884a",rs.getString("va_othername"));
                 String driver = rs.getString("va_driver");
+                JSONObject person = new JSONObject();
                 if (driver!=null&&!"".equals(driver)){
                     Object data = baseDao.getFieldDataByCondition("employee", "em_code",
                             "em_name='" + driver + "'");
-                    json.put("fd_3730d464dd0726",data.toString());
+                    person.put("PersonNo",data.toString());
                 }else {
-                    json.put("fd_3730d464dd0726","");
+                    person.put("PersonNo","");
                 }
+                json.put("fd_3730d464dd0726",person);
                 json.put("fd_3730d46eca287c",rs.getString("va_vecard"));
                 json.put("fd_3730d48679d568",rs.getString("va_address"));
                 json.put("fd_3730d48bc4df32",rs.getString("va_vecode"));
@@ -161,9 +167,9 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
         try {
             SqlRowList rs;
             if (id==0){
-                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_varchar50_3,ct_varchar500_1,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,ct_number_1,ct_number_2,ct_varchar50_5,ct_varchar50_7,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_10,ct_varchar50_11,ct_varchar50_6,ct_varchar50_15 from customtable left join employee on ct_recorder=em_name where ct_caller='JDAPSQB' and ct_status='已审核' and ct_sendstatus='待上传'");
+                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_varchar50_3,ct_varchar500_1,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,ct_number_1,ct_number_2,ct_varchar50_5,ct_varchar50_7,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_10,ct_varchar50_11,ct_varchar50_6,ct_varchar50_15 from customtable left join employee on ct_recorder=em_name where ct_caller='JDAPSQB' and ct_status='已审核' and ct_sendstatus='待上传' and em_islandray=-1");
             }else {
-                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_varchar50_3,ct_varchar500_1,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,ct_number_1,ct_number_2,ct_varchar50_5,ct_varchar50_7,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_10,ct_varchar50_11,ct_varchar50_6,ct_varchar50_15 from customtable left join employee on ct_recorder=em_name where ct_caller='JDAPSQB' and ct_status='已审核' and ct_sendstatus='待上传' and ct_id="+id);
+                rs = baseDao.queryForRowSet("select ct_id,em_code,ct_varchar50_2,ct_varchar50_3,ct_varchar500_1,to_char(ct_date_1,'yyyy-MM-dd HH24:mi:ss') ct_date_1,ct_number_1,ct_number_2,ct_varchar50_5,ct_varchar50_7,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_10,ct_varchar50_11,ct_varchar50_6,ct_varchar50_15 from customtable left join employee on ct_recorder=em_name where ct_caller='JDAPSQB' and ct_status='已审核' and ct_sendstatus='待上传' and em_islandray=-1 and ct_id="+id);
             }
             while (rs.next()) {
                 KmReviewParamterForm form = new KmReviewParamterForm();
@@ -182,15 +188,19 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
                 // 流程表单
                 JSONObject json = new JSONObject();
                 String varchar502 = rs.getString("ct_varchar50_2");
+                JSONObject object = new JSONObject();
+                JSONObject person = new JSONObject();
                 if (varchar502!=null&&!"".equals(varchar502)){
                     Object[] employees = baseDao.getFieldsDataByCondition("employee", "em_code,em_departmentcode", "em_name" + "='" + varchar502 + "'");
-                    json.put("fd_36f09e6d85247c",employees[0].toString());
-                    json.put("fd_36f09e73a165e8",employees[1].toString());
+                    object.put("DeptNo",employees[1].toString());
+                    person.put("PersonNo",employees[0].toString());
                 }else {
-                    json.put("fd_36f09e6d85247c","");
-                    json.put("fd_36f09e73a165e8","");
-                }
+                    object.put("DeptNo","");
+                    person.put("PersonNo","");
 
+                }
+                json.put("fd_36f09e73a165e8",object);
+                json.put("fd_36f09e6d85247c",person);
                 json.put("fd_36f09e7f4364f6",rs.getString("ct_varchar500_1"));
                 json.put("fd_36f09e8870640a",rs.getString("ct_date_1"));
                 json.put("fd_36f09ea1da7e76",rs.getGeneralInt("ct_number_1"));

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
         driverClassName: oracle.jdbc.OracleDriver
         username: SZSI_P
         password: select!#%*(
-        url: jdbc:oracle:thin:@usoft.f3322.net:11522:orcl
+        url: jdbc:oracle:thin:@10.1.81.208:11522:orcl
         initialSize: 10
         maxActive: 80
         minIdle: 10
@@ -45,14 +45,14 @@ logging:
         type: trace
 Task:
   OrgMethod: saveSyncOrgElementsBaseInfo
-  OrgCron: 0 15 13 * * ?
+  OrgCron: 0 11 17 * * ?
   NotifyMethod: syncNotifyData
-  NotifyCron: 0 50 16 * * ?
+  NotifyCron: 0 18 13 * * ?
   SENDYCSQMethod: sendYCSQ
-  SENDYCSQCron: 0 23 10 * * ?
+  SENDYCSQCron: 0 18 17 * * ?
   SENDJDAPMethod: sendJDAP
-  SENDJDAPCron: 0 24 10 * * ?
+  SENDJDAPCron: 0 05 18 * * ?
   SENDHTSPMethod: sendHTSP
-  SENDHTSPCron: 0 25 10 * * ?
+  SENDHTSPCron: 0 51 16 * * ?