修改用车申请字段传值

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_mobile,dp_landrayid,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 left join department on em_departmentcode=dp_code where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1");
+                rs = baseDao.queryForRowSet("select va_id,em_code,em_mobile,dp_landrayid,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,va_reason from Vehicleapply left join employee on va_employee=em_name left join department on em_departmentcode=dp_code where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1");
             }else {
-                rs = baseDao.queryForRowSet("select va_id,em_code,em_mobile,dp_landrayid,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 left join department on em_departmentcode=dp_code where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1 and va_id="+id);
+                rs = baseDao.queryForRowSet("select va_id,em_code,em_mobile,dp_landrayid,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,va_reason from Vehicleapply left join employee on va_employee=em_name left join department on em_departmentcode=dp_code where va_sendstatus='待上传' and va_status='已审核' and em_islandray=-1 and va_id="+id);
             }
             while (rs.next()) {
                 KmReviewParamterForm form = new KmReviewParamterForm();
@@ -115,7 +115,7 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
                 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");
+                /*String driver = rs.getString("va_driver");
                 JSONObject person = new JSONObject();
                 if (driver!=null&&!"".equals(driver)){
                     Object data = baseDao.getFieldDataByCondition("employee", "em_mobile",
@@ -123,12 +123,12 @@ public class KmReviewWebserviceServiceImpl implements KmReviewWebserviceService
                     person.put("LoginName",data.toString());
                 }else {
                     person.put("LoginName","");
-                }
-                json.put("fd_3730d464dd0726",person);
+                }*/
+                json.put("fd_3730d464dd0726",rs.getString("va_driver"));
                 json.put("fd_3730d46eca287c",rs.getString("va_vecard"));
                 json.put("fd_3730d48679d568",rs.getString("va_address"));
                 json.put("fd_3730d48bc4df32",rs.getString("va_vecode"));
-                json.put("fd_3730d4a9ee835e",rs.getString("va_vetype"));
+                json.put("fd_3730d4a9ee835e",rs.getString("va_reason"));
                 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='Vehicleapply' and jp_status='已审批' and jp_keyvalue=" + rs.getGeneralInt("va_id"));