Skip to content

A
api
Commit 436a7c23 by java-李谡
Options

修改条件评估论证bug

parent 5d944759
Showing with 165 additions and 158 deletions
resources/mapper/modules/route/RouteVerifyDao.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</resultMap> </resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
id, verif_id, verify_status, report, form_id, form_text, depart_id, `condition`, create_by, id, verif_id, verify_status, report, form_id, form_text, depart_id, `condition`, create_by,
create_date, update_by, update_date, remarks, del_flag, is_verify, status, start_time,back_status, create_date, update_by, update_date, remarks, del_flag, is_verify, status, start_time,end_time,back_status,
back_time,back_remarks,back_by,summary back_time,back_remarks,back_by,summary
</sql> </sql>
...@@ -108,19 +108,19 @@ ...@@ -108,19 +108,19 @@
</if> </if>
</select> </select>
<select id="findByVerifIdUserCode" resultMap="BaseResultMap"> <select id="findByVerifIdUserCode" resultMap="BaseResultMap">
SELECT SELECT
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
FROM foc_route_verify frv FROM foc_route_verify frv
WHERE 1 = 1 WHERE 1 = 1
<if test="verifId != null and verifId != ''" > <if test="verifId != null and verifId != ''">
AND frv.verif_id = #{verifId} AND frv.verif_id = #{verifId}
</if> </if>
AND frv.depart_id in ( AND frv.depart_id in (
select depart_id from sys_user_profiles select depart_id from sys_user_profiles
where user_id = #{userCode}) where user_id = #{userCode})
</select> </select>
<!-- 根据id获取foc_route_verify数据，userCode获取depart_id与本数据的depart_id比较 --> <!-- 根据id获取foc_route_verify数据，userCode获取depart_id与本数据的depart_id比较 -->
<select id="checkDepartIdWithUserCodeAndId" resultType="Long"> <select id="checkDepartIdWithUserCodeAndId" resultType="Long">
SELECT SELECT
......
resources/mapper/modules/verify/CondationDao.xml
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
select id as conditionId, select id as conditionId,
`condition`, `condition`,
review_type, review_type,
route_id,
is_feed as feedStatus is_feed as feedStatus
from foc_verify_condition from foc_verify_condition
where id=#{conditionId} where id=#{conditionId}
...@@ -326,7 +327,7 @@ ...@@ -326,7 +327,7 @@
delete from foc_verify_condition delete from foc_verify_condition
where id in where id in
<foreach collection="list" item="item" index="index" open="(" close=")" separator=","> <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
${item} #{item}
</foreach> </foreach>
</delete> </delete>
...@@ -334,7 +335,7 @@ ...@@ -334,7 +335,7 @@
DELETE FROM foc_condition_feedback DELETE FROM foc_condition_feedback
WHERE condition_id in WHERE condition_id in
<foreach collection="list" item="item" index="index" open="(" close=")" separator=","> <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
${item} #{item}
</foreach> </foreach>
</delete> </delete>
......
resources/mapper/modules/verify/VerifyFeedbackDao.xml
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
AND a.verif_id = #{verifId} AND a.verif_id = #{verifId}
AND f.depart_id = #{userDepartId} AND f.depart_id = #{userDepartId}
AND a.depart_id= #{departId} AND a.depart_id= #{departId}
-- group by a.verif_id,f.depart_id group by a.verif_id,a.depart_id
</when> </when>
<otherwise> <otherwise>
WHERE WHERE
......
src/com/ejweb/core/conf/GConstants.java
package com.ejweb.core.conf; package com.ejweb.core.conf;
import java.io.File; import com.ejweb.core.security.DES3Utils;
import java.io.InputStream;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import com.ejweb.core.security.DES3Utils; import java.io.File;
import java.io.InputStream;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/** /**
* 全局常量表 * 全局常量表
* @author Administrator
* *
* @author Administrator
*/ */
public class GConstants { public class GConstants {
private static Logger LOG = Logger.getLogger(GConstants.class); private static Logger LOG = Logger.getLogger(GConstants.class);
public static final int HASH_INTERATIONS = 1024; public static final int HASH_INTERATIONS = 1024;
public static final int SALT_SIZE = 8; public static final int SALT_SIZE = 8;
// 常用系统属性 // 常用系统属性
public static final String LS = System.getProperty("line.separator");// 文本换行符 public static final String LS = System.getProperty("line.separator");// 文本换行符
public static final String FS = "/";//System.getProperty("file.separator");// 文件分隔符 public static final String FS = "/";//System.getProperty("file.separator");// 文件分隔符
public static final int BUFFER_SIZE = 8192;// 新建BYTE缓存大小，8*1024; public static final int BUFFER_SIZE = 8192;// 新建BYTE缓存大小，8*1024;
public static final String SEMICOLON = ";";// 分号 public static final String SEMICOLON = ";";// 分号
public static final String[] resources = new String[]{"mybatis-refresh.properties", public static String[] resources = new String[]{"mybatis-refresh.properties", "jdbc.properties", "ejweb.properties"};// 越靠后越配置的值权限越高，即后面的同名变量会覆盖前面的变量
"jdbc.properties", "ejweb.properties"};// 越靠后越配置的值权限越高，即后面的同名变量会覆盖前面的变量
// 文件过滤， // 文件过滤，
public final static Map<String, Boolean> FILE_FILTERS = new HashMap<String, Boolean>(10); public final static Map<String, Boolean> FILE_FILTERS = new HashMap<String, Boolean>(10);
private static final Properties P = new Properties();// 属性变 private static final Properties P = new Properties();// 属性变
public static final GConstants C = new GConstants();// 单实体类 public static final GConstants C = new GConstants();// 单实体类
// 是|否 // 是|否
public static final String YES = "1"; public static final String YES = "1";
public static final String NO = "0"; public static final String NO = "0";
public static final String OK = "OK"; public static final String OK = "OK";
public static final String EMPTY = "EMPTY"; public static final String EMPTY = "EMPTY";
// public static final String USER_TYPE_INNER = "INNER"; // public static final String USER_TYPE_INNER = "INNER";
// public static final String USER_TYPE_OUTER = "OUTER"; // public static final String USER_TYPE_OUTER = "OUTER";
public static final String IM_TYPE_INNER = "INNER";// 内部联系人 public static final String IM_TYPE_INNER = "INNER";// 内部联系人
public static final String IM_TYPE_OUTER = "OUTER";// 外部联系人 public static final String IM_TYPE_OUTER = "OUTER";// 外部联系人
public static final String IM_TYPE_SEAT = "SEAT";// 席位联系人 public static final String IM_TYPE_SEAT = "SEAT";// 席位联系人
public static final String IM_TYPE_STTION = "STATION";// 场站联系人 public static final String IM_TYPE_STTION = "STATION";// 场站联系人
public static final String SIGN_PRIVATE_KEY = GConstants.getValue("content.sign.private.key", "FvNMhdkN5eTsgAfU2YHGJ2RfpKVi3omn");// 签名私钥 public static final String SIGN_PRIVATE_KEY = GConstants.getValue("content.sign.private.key", "FvNMhdkN5eTsgAfU2YHGJ2RfpKVi3omn");// 签名私钥
public static final boolean IS_VERIFY_CONTENT_SIGN = GConstants.getBoolean("is.verify.content.sign", false);// 是否验证签名 public static final boolean IS_VERIFY_CONTENT_SIGN = GConstants.getBoolean("is.verify.content.sign", false);// 是否验证签名
// 将基本配置导入为固定常量 // 将基本配置导入为固定常量
// public static final String SERVER_HTTP_URL = GConstants.getValue("server.http.url");// 服务器HTTP基本地址，必须也反斜杠结尾 // public static final String SERVER_HTTP_URL = GConstants.getValue("server.http.url");// 服务器HTTP基本地址，必须也反斜杠结尾
// public static final String SERVER_HTTPS_URL = GConstants.getValue("server.https.url");// 服务器HTTPS基本地址，必须也反斜杠结尾 // public static final String SERVER_HTTPS_URL = GConstants.getValue("server.https.url");// 服务器HTTPS基本地址，必须也反斜杠结尾
// public static final String SERVER_IP_URL = GConstants.getValue("server.ip.url");// 服务器IP基本地址，必须也反斜杠结尾 // public static final String SERVER_IP_URL = GConstants.getValue("server.ip.url");// 服务器IP基本地址，必须也反斜杠结尾
// public static final String WAP_PAY_RETURN_URL = GConstants.getValue("wap.pay.return.url");// WAP支付PHP回调地址 // public static final String WAP_PAY_RETURN_URL = GConstants.getValue("wap.pay.return.url");// WAP支付PHP回调地址
// public static final String PUSH_SERVER_URL = GConstants.getValue("push.server.url");// 推送服务器地址 // public static final String PUSH_SERVER_URL = GConstants.getValue("push.server.url");// 推送服务器地址
public static final String FILE_UPLOAD_DIR = GConstants.getValue("file.upload.dir");// 文件上传地址 public static final String FILE_UPLOAD_DIR = GConstants.getValue("file.upload.dir");// 文件上传地址
public static final String FILE_PREFIX_URL = GConstants.getValue("file.prefix.url");// 文件读取URL前缀 public static final String FILE_PREFIX_URL = GConstants.getValue("file.prefix.url");// 文件读取URL前缀
public static final String FILE_TMP_DIR = FILE_UPLOAD_DIR+"tmp";// 临时文件地址 public static final String FILE_TMP_DIR = FILE_UPLOAD_DIR + "tmp";// 临时文件地址
public static final String FILE_IMAGE_THUMBS = "thumbs";// 缩略图文件顶级路径名称 201605/thumbs/images/user/png/0d7ed36548c9ea6586363d4de5cb322c.png public static final String FILE_IMAGE_THUMBS = "thumbs";// 缩略图文件顶级路径名称 201605/thumbs/images/user/png/0d7ed36548c9ea6586363d4de5cb322c.png
public static final String FILE_IMAGE_ACTUALS = "actuals";// 原图文件顶级路径名称 201605/actuals/images/user/png/0d7ed36548c9ea6586363d4de5cb322c.png public static final String FILE_IMAGE_ACTUALS = "actuals";// 原图文件顶级路径名称 201605/actuals/images/user/png/0d7ed36548c9ea6586363d4de5cb322c.png
public static final boolean FILE_ALLOW_THUMBS = GConstants.getBoolean("file.image.thumb.is.allow", true); public static final boolean FILE_ALLOW_THUMBS = GConstants.getBoolean("file.image.thumb.is.allow", true);
public static final int PAGE_SIZE = GConstants.getIntValue("page.size", 10);// 默认分页条数，默认10条 public static final int PAGE_SIZE = GConstants.getIntValue("page.size", 10);// 默认分页条数，默认10条
public static final int MAX_UPLOAD_SIZE = GConstants.getIntValue("file.max.upload.size", 10485760);// 允许最多上传文件大小，默认10M public static final int MAX_UPLOAD_SIZE = GConstants.getIntValue("file.max.upload.size", 10485760);// 允许最多上传文件大小，默认10M
// 是否开启手机视图拦截器 // 是否开启手机视图拦截器
public static final boolean IS_MOBILE_INTERCEPTOR = GConstants.getBoolean("is.mobile.interceptor", true); public static final boolean IS_MOBILE_INTERCEPTOR = GConstants.getBoolean("is.mobile.interceptor", true);
public static final String DEFAULT_USER_ROLE_CODE = GConstants.getValue("default.user.role.code", "_USER");// 默认用户角色 public static final String DEFAULT_USER_ROLE_CODE = GConstants.getValue("default.user.role.code", "_USER");// 默认用户角色
// public static final String DEFAULT_USER_AVATAR = GConstants.getValue("user.default.avatar", "");// 默认用户角色 // public static final String DEFAULT_USER_AVATAR = GConstants.getValue("user.default.avatar", "");// 默认用户角色
public static final String DEFAULT_SEAT_PHOTO = GConstants.getValue("seat.default.photo", "");// 默认用户角色 public static final String DEFAULT_SEAT_PHOTO = GConstants.getValue("seat.default.photo", "");// 默认用户角色
public static final String DEFAULT_APP_CODE = GConstants.getValue("default.app.code", "00000"); public static final String DEFAULT_APP_CODE = GConstants.getValue("default.app.code", "00000");
public static final String JDAIR_BASE_API = GConstants.getValue("jdair.api.base.url", ""); public static final String JDAIR_BASE_API = GConstants.getValue("jdair.api.base.url", "");
public static final String JDAIR_BASE_PARAM = GConstants.getValue("jdair.api.base.param", ""); public static final String JDAIR_BASE_PARAM = GConstants.getValue("jdair.api.base.param", "");
public static final String JDAIR_SMS_API = GConstants.getValue("jdair.api.sms.url", "http://user.jdair.net/ussinterface/uss/json/mobile/messSend.json?ai.cp=10.68.26.52&ai.cc=5"); public static final String JDAIR_SMS_API = GConstants.getValue("jdair.api.sms.url", "http://user.jdair.net/ussinterface/uss/json/mobile/messSend.json?ai.cp=10.68.26.52&ai.cc=5");
private static final String CONF_DESC_KEY = "2012PinganVitality075522628888ForShenZhenBelter075561869839"; private static final String CONF_DESC_KEY = "2012PinganVitality075522628888ForShenZhenBelter075561869839";
public static final String JDBC_DRIVER_CLASS = "jdbc.driver.class"; public static final String JDBC_DRIVER_CLASS = "jdbc.driver.class";
public static final String JDBC_URL = "jdbc.url"; public static final String JDBC_URL = "jdbc.url";
public static final String JDBC_USERNAME = "jdbc.username"; public static final String JDBC_USERNAME = "jdbc.username";
public static final String JDBC_PASSWORD = "jdbc.password"; public static final String JDBC_PASSWORD = "jdbc.password";
// 电话类型 // 电话类型
public static final String CALL_TYPE_MOBILE = "MOBILE";// 移动电话 public static final String CALL_TYPE_MOBILE = "MOBILE";// 移动电话
public static final String CALL_TYPE_HW_CORNET = "HW_CORNET";// 华为短号 public static final String CALL_TYPE_HW_CORNET = "HW_CORNET";// 华为短号
public static final String CALL_TYPE_PHONE = "PHONE";// 座机 public static final String CALL_TYPE_PHONE = "PHONE";// 座机
/** /**
* 默认头像 * 默认头像
*/ */
public static final String OUTER_USER_PHOTO = "images/user/avatar/outuser_avatar.png"; public static final String OUTER_USER_PHOTO = "images/user/avatar/outuser_avatar.png";
public static final String COMMON_USER_PHOTO_FEMALE = "images/user/avatar/female_avatar.png"; public static final String COMMON_USER_PHOTO_FEMALE = "images/user/avatar/female_avatar.png";
public static final String COMMON_USER_PHOTO_MALE = "images/user/avatar/male_avatar.png"; public static final String COMMON_USER_PHOTO_MALE = "images/user/avatar/male_avatar.png";
/** /**
* 签到涉及到的相关配置 * 签到涉及到的相关配置
...@@ -111,35 +109,35 @@ public class GConstants { ...@@ -111,35 +109,35 @@ public class GConstants {
public static final int DEFAULT_PRE40_TIME = 40; public static final int DEFAULT_PRE40_TIME = 40;
public static final String DEFAULT_SIGN_SEAT = "乘务调度席"; public static final String DEFAULT_SIGN_SEAT = "乘务调度席";
private GConstants(){ private GConstants() {
// 加载基本配置文件 // 加载基本配置文件
// 加载基本配置文件 // 加载基本配置文件
InputStream is = null; InputStream is = null;
ResourceLoader resourceLoader = null; ResourceLoader resourceLoader = null;
Resource resource = null; Resource resource = null;
for(String location:resources){// 加载配置文件 for (String location : resources) {// 加载配置文件
try { try {
resourceLoader = new DefaultResourceLoader(); resourceLoader = new DefaultResourceLoader();
resource = resourceLoader.getResource(location); resource = resourceLoader.getResource(location);
is = resource.getInputStream(); is = resource.getInputStream();
P.load(is); P.load(is);
LOG.debug("加载"+location+"成功"); LOG.debug("加载" + location + "成功");
} catch (Exception e) { } catch (Exception e) {
LOG.info("加载"+location+"失败", e); LOG.info("加载" + location + "失败", e);
} finally { } finally {
IOUtils.closeQuietly(is); IOUtils.closeQuietly(is);
} }
} }
try { try {
Enumeration<?> enu = P.propertyNames(); Enumeration<?> enu = P.propertyNames();
while (enu.hasMoreElements()) { while (enu.hasMoreElements()) {
try { try {
String key = (String) enu.nextElement(); String key = (String) enu.nextElement();
String val = (String) P.get(key); String val = (String) P.get(key);
String decorded = DES3Utils.decrypt(val, CONF_DESC_KEY); String decorded = DES3Utils.decrypt(val, CONF_DESC_KEY);
if(decorded != null){ if (decorded != null) {
P.put(key, decorded); P.put(key, decorded);
} }
// if("is.devmode".equals(key) == false){// 测试模式不需要加密，正式才需要 // if("is.devmode".equals(key) == false){// 测试模式不需要加密，正式才需要
...@@ -159,32 +157,32 @@ public class GConstants { ...@@ -159,32 +157,32 @@ public class GConstants {
try { try {
// 上传文件扩展名称限制 // 上传文件扩展名称限制
String extensions = GConstants.getValue("file.allow.extensions"); String extensions = GConstants.getValue("file.allow.extensions");
if(extensions != null && extensions.contains(SEMICOLON)){ if (extensions != null && extensions.contains(SEMICOLON)) {
if(extensions.length() != 0){ if (extensions.length() != 0) {
String[] patternList = extensions.split(SEMICOLON); String[] patternList = extensions.split(SEMICOLON);
for (String ext : patternList) { for (String ext : patternList) {
if(ext.trim().length() != 0){ if (ext.trim().length() != 0) {
FILE_FILTERS.put(ext.trim().toLowerCase(), false); FILE_FILTERS.put(ext.trim().toLowerCase(), false);
} }
} }
} }
} }
// 图片后缀文件 // 图片后缀文件
extensions = GConstants.getValue("file.image.extensions"); extensions = GConstants.getValue("file.image.extensions");
if(extensions != null && extensions.contains(SEMICOLON)){ if (extensions != null && extensions.contains(SEMICOLON)) {
if(extensions.length() != 0){ if (extensions.length() != 0) {
String[] patternList = extensions.split(SEMICOLON); String[] patternList = extensions.split(SEMICOLON);
for (String ext : patternList) { for (String ext : patternList) {
if(ext.trim().length() != 0){ if (ext.trim().length() != 0) {
FILE_FILTERS.put(ext.trim().toLowerCase(), true); FILE_FILTERS.put(ext.trim().toLowerCase(), true);
} }
} }
} }
} }
// 临时文件夹路径 // 临时文件夹路径
if(P.getProperty("file.upload.dir") != null){ if (P.getProperty("file.upload.dir") != null) {
File tmp = new File(P.getProperty("file.upload.dir")+"tmp"); File tmp = new File(P.getProperty("file.upload.dir") + "tmp");
if(!tmp.exists()) if (!tmp.exists())
tmp.mkdirs(); tmp.mkdirs();
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -192,35 +190,39 @@ public class GConstants { ...@@ -192,35 +190,39 @@ public class GConstants {
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* 获取属性，以自定义属性优先，然后回去系统属性 * 获取属性，以自定义属性优先，然后回去系统属性
*
* @param key * @param key
* @return * @return
*/ */
public static String getValue(String key) { public static String getValue(String key) {
if(key == null) if (key == null)
return null; return null;
if (P.containsKey(key)) { if (P.containsKey(key)) {
return P.getProperty(key); return P.getProperty(key);
} }
return System.getProperty(key); return System.getProperty(key);
} }
public static String getValue(String key, String want) { public static String getValue(String key, String want) {
String val = getValue(key); String val = getValue(key);
if(val == null) if (val == null)
return want; return want;
return val; return val;
} }
/** /**
* 解析为Boolean类型 * 解析为Boolean类型
*
* @param key * @param key
* @param want * @param want
* @return * @return
*/ */
public static boolean getBoolean(String key, boolean want) { public static boolean getBoolean(String key, boolean want) {
String val = getValue(key); String val = getValue(key);
if(val == null || val.length() == 0) if (val == null || val.length() == 0)
return want; return want;
try { try {
return Boolean.parseBoolean(val); return Boolean.parseBoolean(val);
...@@ -229,15 +231,17 @@ public class GConstants { ...@@ -229,15 +231,17 @@ public class GConstants {
} }
return want; return want;
} }
/** /**
* 获取整型数据，转换数据类型 * 获取整型数据，转换数据类型
*
* @param key * @param key
* @param want * @param want
* @return * @return
*/ */
public static int getIntValue(String key, int want) { public static int getIntValue(String key, int want) {
String val = getValue(key); String val = getValue(key);
if(val == null || val.length() == 0) if (val == null || val.length() == 0)
return want; return want;
try { try {
return Integer.parseInt(val); return Integer.parseInt(val);
...@@ -246,15 +250,17 @@ public class GConstants { ...@@ -246,15 +250,17 @@ public class GConstants {
} }
return want; return want;
} }
/** /**
* 获取长整型数据 * 获取长整型数据
*
* @param key * @param key
* @param want * @param want
* @return * @return
*/ */
public static long getLongValue(String key, long want) { public static long getLongValue(String key, long want) {
String val = getValue(key); String val = getValue(key);
if(val == null || val.length() == 0) if (val == null || val.length() == 0)
return want; return want;
try { try {
return Long.parseLong(val); return Long.parseLong(val);
...@@ -263,9 +269,10 @@ public class GConstants { ...@@ -263,9 +269,10 @@ public class GConstants {
} }
return want; return want;
} }
public static float getFloatValue(String key, float want) { public static float getFloatValue(String key, float want) {
String val = getValue(key); String val = getValue(key);
if(val == null || val.length() == 0) if (val == null || val.length() == 0)
return want; return want;
try { try {
return Float.parseFloat(val); return Float.parseFloat(val);
...@@ -274,9 +281,10 @@ public class GConstants { ...@@ -274,9 +281,10 @@ public class GConstants {
} }
return want; return want;
} }
public static double getDoubleValue(String key, double want) { public static double getDoubleValue(String key, double want) {
String val = getValue(key); String val = getValue(key);
if(val == null || val.length() == 0) if (val == null || val.length() == 0)
return want; return want;
try { try {
return Double.parseDouble(val); return Double.parseDouble(val);
......
src/com/ejweb/core/fetcher/HttpClientUtil.java
package com.ejweb.core.fetcher; package com.ejweb.core.fetcher;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.security.GlobalUtil;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
...@@ -14,7 +10,10 @@ import org.apache.http.impl.client.HttpClients; ...@@ -14,7 +10,10 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import java.util.*; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
/** /**
...@@ -54,37 +53,4 @@ public class HttpClientUtil { ...@@ -54,37 +53,4 @@ public class HttpClientUtil {
} }
return result; return result;
} }
}
public static void main(String[] args) { \ No newline at end of file
try {
// StringBuilder url = new StringBuilder("https://ewatch.okayapps.com/faq/api/user/login");
StringBuilder url = new StringBuilder("https://ewatch.okayapps.com/faq/api/ask/detail");
String loginName = "root";
String password = "1";
JSONObject content = new JSONObject();
content.put("appCode", "10001");
content.put("versionName", "1.0");
content.put("platform", "Android");
content.put("language", "zh_CN");
content.put("appCode", "10001");
content.put("loginName", "root");
content.put("password", "admin");
content.put("userCode", "userId");
content.put("id", "93648376039909180225");
Map<String, String> params = new HashMap<String, String>();
params.put("content", JSON.toJSONString(content));
String sign = GlobalUtil.getParamsSignStr(GConstants.SIGN_PRIVATE_KEY, params.get("content"));
params.put("sign", sign);
String res = HttpClientUtil.doPost(url.toString(), params, "UTF-8");
// JSONObject object = JSON.parseObject(res);
System.out.println(res);
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
}
}
\ No newline at end of file
src/com/ejweb/modules/route/service/RouteVerifyService.java
...@@ -406,7 +406,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -406,7 +406,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
return verifyConditionEntities; return verifyConditionEntities;
} }
private void insertAirlineConclusion(RouteVerifyBean routeVerifyBean, String userCode) { public void insertAirlineConclusion(RouteVerifyBean routeVerifyBean, String userCode) {
// 查询foc_route_verify所有与传参verifId相同的数据的verifyStatus均为01时，foc_airline_conclusion插入一条数据 // 查询foc_route_verify所有与传参verifId相同的数据的verifyStatus均为01时，foc_airline_conclusion插入一条数据
// 判断是否全部论证部门完成论证 // 判断是否全部论证部门完成论证
......
src/com/ejweb/modules/verify/api/VerifyFeedbackController.java
...@@ -180,11 +180,11 @@ public class VerifyFeedbackController { ...@@ -180,11 +180,11 @@ public class VerifyFeedbackController {
bean.setUpdateDate(new Date()); bean.setUpdateDate(new Date());
feedbackService.updateFeedback(bean); feedbackService.updateFeedback(bean);
// 提示有新的反馈 // 提示有新的反馈
VerifyFeedbackStatusBean statusBean = new VerifyFeedbackStatusBean(); // VerifyFeedbackStatusBean statusBean = new VerifyFeedbackStatusBean();
statusBean.setVerifId(bean.getVerifId()); // statusBean.setVerifId(bean.getVerifId());
statusBean.setStatus("1"); // statusBean.setStatus("1");
statusBean.setConditionId(bean.getConditionId()); // statusBean.setConditionId(bean.getConditionId());
feedbackService.updateStatus(statusBean); // feedbackService.updateStatus(statusBean);
return responseBean; return responseBean;
} }
} }
......
src/com/ejweb/modules/verify/data/ConditionDetailData.java
...@@ -10,6 +10,7 @@ import java.util.Map; ...@@ -10,6 +10,7 @@ import java.util.Map;
*/ */
public class ConditionDetailData { public class ConditionDetailData {
private String conditionId; private String conditionId;
private String routeId;
private String condition; private String condition;
private String conditionDate; private String conditionDate;
private int feedStatus; private int feedStatus;
...@@ -63,4 +64,12 @@ public class ConditionDetailData { ...@@ -63,4 +64,12 @@ public class ConditionDetailData {
public void setReviewType(String reviewType) { public void setReviewType(String reviewType) {
this.reviewType = reviewType; this.reviewType = reviewType;
} }
public String getRouteId() {
return routeId;
}
public void setRouteId(String routeId) {
this.routeId = routeId;
}
} }
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
...@@ -8,8 +8,10 @@ import com.ejweb.core.base.PageEntity; ...@@ -8,8 +8,10 @@ import com.ejweb.core.base.PageEntity;
import com.ejweb.core.exception.RecordNotExistException; import com.ejweb.core.exception.RecordNotExistException;
import com.ejweb.modules.depart.dao.DepartDao; import com.ejweb.modules.depart.dao.DepartDao;
import com.ejweb.modules.depart.entity.DepartEntity; import com.ejweb.modules.depart.entity.DepartEntity;
import com.ejweb.modules.route.bean.RouteVerifyBean;
import com.ejweb.modules.route.dao.RouteVerifyDao; import com.ejweb.modules.route.dao.RouteVerifyDao;
import com.ejweb.modules.route.entity.FullRouteVerifyEntity; import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
import com.ejweb.modules.route.service.RouteVerifyService;
import com.ejweb.modules.verify.bean.*; import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.dao.AirlineVerifyDao; import com.ejweb.modules.verify.dao.AirlineVerifyDao;
import com.ejweb.modules.verify.dao.ConditionDao; import com.ejweb.modules.verify.dao.ConditionDao;
...@@ -48,6 +50,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -48,6 +50,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
DepartDao departDao; DepartDao departDao;
@Autowired @Autowired
RouteVerifyDao routeVerifyDao; RouteVerifyDao routeVerifyDao;
@Autowired
RouteVerifyService routeVerifyService;
public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) { public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
PageInfo<VerifyFeedbackEntity> pageInfo; PageInfo<VerifyFeedbackEntity> pageInfo;
...@@ -154,7 +158,26 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -154,7 +158,26 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
ConditionUpdateBean updateBean = new ConditionUpdateBean(); ConditionUpdateBean updateBean = new ConditionUpdateBean();
updateBean.setReviewType(data.getReviewType()); updateBean.setReviewType(data.getReviewType());
updateBean.setConditionId(data.getConditionId()); updateBean.setConditionId(data.getConditionId());
//设置该条件完成
conditionDao.updateConditionComplete(updateBean); conditionDao.updateConditionComplete(updateBean);
//判断该条件提出部门提出的所有条件是否都完成，如果完成，设置部门由条件可行变为条件满足
//判断是否所有部门已经反馈完
FullRouteVerifyEntity fullRouteVerifyEntity = routeVerifyDao.selectByPrimaryKey(data.getRouteId());
int count = conditionDao.getUndoneCondition(fullRouteVerifyEntity.getId());
if (count != 0) {
return true;
}
//条件可行变为条件满足
fullRouteVerifyEntity.setVerifyStatus("04");
//填写论证条件总结
fullRouteVerifyEntity.setSummary("各条件均无需复核，系统默认条件满足");
routeVerifyDao.updateByPrimaryKey(fullRouteVerifyEntity);
conditionDao.updateCompleteByRouteId(fullRouteVerifyEntity.getId());
//判断论证单所有部门论证是否完成，如果完成，进入论证总结阶段
RouteVerifyBean routeVerifyBean = new RouteVerifyBean();
routeVerifyBean.setVerifId(fullRouteVerifyEntity.getVerifId());
routeVerifyService.insertAirlineConclusion(routeVerifyBean, bean.getUserCode());
} else { } else {
dao.updateCondition(bean); dao.updateCondition(bean);
} }
...@@ -243,7 +266,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -243,7 +266,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
} }
private List<ConditionDetailData> getConditionDetailData(VerifyFeedbackDetailBean verifyFeedbackBean) { private List<ConditionDetailData> getConditionDetailData(VerifyFeedbackDetailBean verifyFeedbackBean) {
List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean); List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
List<ConditionDetailData> conditionList = new ArrayList<>(); List<ConditionDetailData> conditionList = new ArrayList<>();
if (!CollectionUtils.isEmpty(conditions)) { if (!CollectionUtils.isEmpty(conditions)) {
for (ConditionDetailData data : conditions) { for (ConditionDetailData data : conditions) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment