Skip to content

A
api
Commit 1704adc1 by Lenovo
Options

调机修改

parent bc0ee881
Showing with 669 additions and 342 deletions
resources/mapper/modules/route/RouteVerifyDao.xml
...@@ -83,21 +83,15 @@ ...@@ -83,21 +83,15 @@
AND frv.verif_id = #{verifId} AND frv.verif_id = #{verifId}
</select> </select>
<!-- 获取论证表详情 --> <!-- 获取论证表详情 -->
<select id="detail" resultType="com.ejweb.modules.route.entity.RouteVerifyEntity"> <select id="detail" resultType="com.ejweb.modules.route.entity.RouteVerifyEntity">
SELECT SELECT
(t.id) conditionId,
s.id, s.id,
verify_status, verify_status,
s.`condition`,
s.remarks, s.remarks,
s.depart_id, s.depart_id,
s.form_text, s.form_text,
t.remarks AS conditionRemarks, s.status
case WHEN t.is_feed!='0' THEN DATE_FORMAT(t.update_date, '%Y-%m-%d')
else '' end conditionDate,
s.status
FROM foc_route_verify s FROM foc_route_verify s
LEFT JOIN foc_verify_condition t ON s.id = t.route_id
WHERE 1 = 1 WHERE 1 = 1
<if test="verifId != null and verifId != ''" > <if test="verifId != null and verifId != ''" >
AND s.verif_id = #{verifId} AND s.verif_id = #{verifId}
...@@ -110,8 +104,6 @@ ...@@ -110,8 +104,6 @@
<if test="departId != null and departId != ''"> <if test="departId != null and departId != ''">
AND s.depart_id =#{departId} AND s.depart_id =#{departId}
</if> </if>
ORDER BY t.create_date desc
LIMIT 1
</select> </select>
<select id="findByVerifIdUserCode" resultMap="BaseResultMap"> <select id="findByVerifIdUserCode" resultMap="BaseResultMap">
......
resources/mapper/modules/verify/CondationDao.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
roundtrip_type, roundtrip_type,
a.verif_status AS verifStatus, a.verif_status AS verifStatus,
a.verif_type AS verifType, a.verif_type AS verifType,
s.id AS conditionId, -- s.id AS conditionId,
a.start_time AS sailingDate, a.start_time AS sailingDate,
DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate
</sql> </sql>
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<if test="aircraftType != null and aircraftType != ''"> <if test="aircraftType != null and aircraftType != ''">
AND a.aircraft_type = #{aircraftType} AND a.aircraft_type = #{aircraftType}
</if> </if>
GROUP BY s.verif_id,s.depart_id
<!-- AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) --> <!-- AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) -->
</select> </select>
...@@ -84,18 +85,25 @@ ...@@ -84,18 +85,25 @@
<select id="getDetail" resultType="com.ejweb.modules.verify.entity.ConditionDetailEntity"> <select id="getDetail" resultType="com.ejweb.modules.verify.entity.ConditionDetailEntity">
SELECT SELECT
a.verif_id AS verifId, a.verif_id AS verifId,
a.condition,
a.depart_id AS departId, a.depart_id AS departId,
q.depart_name AS departName, q.depart_name AS departName,
a.verify_status AS verifyStatus, a.verify_status AS verifyStatus,
a.id AS routeId, a.id AS routeId
p.id AS conditionId
from foc_route_verify a from foc_route_verify a
LEFT JOIN foc_verify_condition p ON a.id=p.route_id AND is_feed='0'
LEFT JOIN foc_user_depart q ON a.depart_id=q.id LEFT JOIN foc_user_depart q ON a.depart_id=q.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL} and a.verif_id=#{verifId} and a.depart_id=#{departId};
AND p.id= #{conditionId}
</select>
<select id="findByVerifyIdAndDepartId" resultType="com.ejweb.modules.verify.data.ConditionDetailData">
select id as conditionId,
`condition`,
is_feed as feedStatus,
case WHEN is_feed!='0' THEN DATE_FORMAT(update_date, '%Y-%m-%d')
else '' end conditionDate
from foc_verify_condition
where depart_id=#{departId}
and verif_id=#{verifId}
</select> </select>
<insert id="insertfeedback"> <insert id="insertfeedback">
......
resources/mapper/modules/verify/VerifyConditionDao.xml
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
<insert id="insert" parameterType="com.ejweb.modules.verify.entity.FullVerifyConditionEntity" > <insert id="insert" parameterType="com.ejweb.modules.verify.entity.FullVerifyConditionEntity" >
insert into foc_verify_condition (id, parent_id, route_id, insert into foc_verify_condition (id, parent_id, route_id,
verif_id, depart_id, condition_status, verif_id, depart_id, condition_status, `condition`,
create_by, create_date, update_by, create_by, create_date, update_by,
update_date, remarks, complete, update_date, remarks, complete,
is_feed) is_feed)
values (#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{routeId,jdbcType=VARCHAR}, values (#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{routeId,jdbcType=VARCHAR},
#{verifId,jdbcType=VARCHAR}, #{departId,jdbcType=VARCHAR}, #{conditionStatus,jdbcType=VARCHAR}, #{verifId,jdbcType=VARCHAR}, #{departId,jdbcType=VARCHAR}, #{conditionStatus,jdbcType=VARCHAR}, #{condition,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
#{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{complete,jdbcType=CHAR}, #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{complete,jdbcType=CHAR},
#{isFeed,jdbcType=CHAR}) #{isFeed,jdbcType=CHAR})
......
resources/mapper/modules/verify/VerifyFeedbackDao.xml
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
FROM foc_route_verify a FROM foc_route_verify a
LEFT JOIN foc_airline_verify s ON a.verif_id=s.id LEFT JOIN foc_airline_verify s ON a.verif_id=s.id
LEFT JOIN foc_verify_condition t ON a.id=t.route_id LEFT JOIN foc_verify_condition t ON a.id=t.route_id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND t.id = #{conditionId} AND t.id = #{conditionId}
......
resources/mybatis-config.xml
...@@ -37,6 +37,6 @@ ...@@ -37,6 +37,6 @@
<setting name="jdbcTypeForNull" value="NULL"/> <setting name="jdbcTypeForNull" value="NULL"/>
<!--打印sql--> <!--打印sql-->
<!--<setting name="logImpl" value="STDOUT_LOGGING"/>--> <setting name="logImpl" value="STDOUT_LOGGING"/>
</settings> </settings>
</configuration> </configuration>
src/com/ejweb/modules/route/api/RouteVerifyController.java
package com.ejweb.modules.route.api; package com.ejweb.modules.route.api;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ejweb.core.api.RequestBean; import com.ejweb.core.api.RequestBean;
import com.ejweb.core.api.ResponseBean; import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
import com.ejweb.core.conf.ErrorCode; import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants; import com.ejweb.core.conf.GConstants;
import com.ejweb.core.utils.excel.ExportExcel; import com.ejweb.core.utils.excel.ExportExcel;
import com.ejweb.modules.route.bean.AirlineVerifyBean; import com.ejweb.modules.route.bean.*;
import com.ejweb.modules.route.bean.RouteVerifyBean;
import com.ejweb.modules.route.bean.RouteVerifyDetailBean;
import com.ejweb.modules.route.bean.VerifyCheckBean;
import com.ejweb.modules.route.bean.VerifyStatusBean;
import com.ejweb.modules.route.entity.AirlineVerifyEntity; import com.ejweb.modules.route.entity.AirlineVerifyEntity;
import com.ejweb.modules.route.entity.RouteVerifyDetailEntity;
import com.ejweb.modules.route.entity.RouteVerifyEntity; import com.ejweb.modules.route.entity.RouteVerifyEntity;
import com.ejweb.modules.route.service.RouteVerifyService; import com.ejweb.modules.route.service.RouteVerifyService;
import com.ejweb.modules.verify.bean.AirlineVerifiedAddBean; import com.ejweb.modules.verify.bean.AirlineVerifiedAddBean;
import com.ejweb.modules.verify.service.AirlineVerifyService; import com.ejweb.modules.verify.service.AirlineVerifyService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/** /**
* 航线论证接口 * 航线论证接口
* *
* @team IT Team
* @author panjianlin * @author panjianlin
* @version 1.0 * @version 1.0
* @time 2016年9月5日 * @team IT Team
* @time 2016年9月5日
*/ */
@Controller @Controller
@RequestMapping(value = "/api/route/verify") @RequestMapping(value = "/api/route/verify")
...@@ -46,22 +41,22 @@ public class RouteVerifyController { ...@@ -46,22 +41,22 @@ public class RouteVerifyController {
@Autowired @Autowired
RouteVerifyService routeVerifyService; RouteVerifyService routeVerifyService;
@Autowired @Autowired
AirlineVerifyService airlineVerifyService; AirlineVerifyService airlineVerifyService;
@ResponseBody @ResponseBody
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
public ResponseBean getRiskAssessmentList(RequestBean requestBean){ public ResponseBean getRiskAssessmentList(RequestBean requestBean) {
PageEntity<AirlineVerifyEntity> list = null; PageEntity<AirlineVerifyEntity> list = null;
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class); AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
String message = airlineVerifyService.validate(bean); String message = airlineVerifyService.validate(bean);
if(message == null){// 通过参数校验 if (message == null) {// 通过参数校验
list = airlineVerifyService.getRiskAssessmentList(bean); list = airlineVerifyService.getRiskAssessmentList(bean);
if(list == null){// 查询结果为空 if (list == null) {// 查询结果为空
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -76,19 +71,19 @@ public class RouteVerifyController { ...@@ -76,19 +71,19 @@ public class RouteVerifyController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping(value = "/findlist") @RequestMapping(value = "/findlist")
public ResponseBean findlist(RequestBean requestBean){ public ResponseBean findlist(RequestBean requestBean) {
PageEntity<RouteVerifyEntity> list = null; PageEntity<RouteVerifyEntity> list = null;
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
RouteVerifyBean bean = requestBean.getObjectBean(RouteVerifyBean.class); RouteVerifyBean bean = requestBean.getObjectBean(RouteVerifyBean.class);
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if(message == null){// 通过参数校验 if (message == null) {// 通过参数校验
list = routeVerifyService.findlist(bean); list = routeVerifyService.findlist(bean);
if(list == null){// 查询结果为空 if (list == null) {// 查询结果为空
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -103,20 +98,23 @@ public class RouteVerifyController { ...@@ -103,20 +98,23 @@ public class RouteVerifyController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
/** /**
* 修改论证部门 * 修改论证部门
*
* @param requestBean * @param requestBean
* @return * @return
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "/updatedeport") @RequestMapping(value = "/updatedeport")
public ResponseBean updateDeport(RequestBean requestBean){ public ResponseBean updateDeport(RequestBean requestBean) {
PageEntity<RouteVerifyEntity> list = null; PageEntity<RouteVerifyEntity> list = null;
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
AirlineVerifiedAddBean bean = requestBean.getObjectBean(AirlineVerifiedAddBean.class); AirlineVerifiedAddBean bean = requestBean.getObjectBean(AirlineVerifiedAddBean.class);
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
routeVerifyService.updateDeport(bean); routeVerifyService.updateDeport(bean);
responseBean.setMessage(GConstants.OK); responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000); responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
...@@ -126,24 +124,24 @@ public class RouteVerifyController { ...@@ -126,24 +124,24 @@ public class RouteVerifyController {
responseBean.setMessage(message); responseBean.setMessage(message);
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping(value = "/detail") @RequestMapping(value = "/detail")
public ResponseBean detail(RequestBean requestBean){ public ResponseBean detail(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
RouteVerifyDetailBean bean = requestBean.getObjectBean(RouteVerifyDetailBean.class); RouteVerifyDetailBean bean = requestBean.getObjectBean(RouteVerifyDetailBean.class);
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if(StringUtils.isBlank(bean.getDepartId())==StringUtils.isBlank(bean.getUserCode())){ if (StringUtils.isBlank(bean.getDepartId()) == StringUtils.isBlank(bean.getUserCode())) {
responseBean.setMessage("userCode与departId不能同时为空"); responseBean.setMessage("userCode与departId不能同时为空");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
if(message == null){// 通过参数校验 // 通过参数校验
RouteVerifyEntity entity = routeVerifyService.detail(bean); if (message == null) {
if(entity == null){// 查询结果为空 RouteVerifyDetailEntity entity = routeVerifyService.detail(bean);
// 查询结果为空
if (entity == null) {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -158,8 +156,10 @@ public class RouteVerifyController { ...@@ -158,8 +156,10 @@ public class RouteVerifyController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
//论证意见修改 /**
* 论证意见修改
*/
@ResponseBody @ResponseBody
@RequestMapping(value = "/updateStatus") @RequestMapping(value = "/updateStatus")
public ResponseBean updateStatus(RequestBean requestBean) { public ResponseBean updateStatus(RequestBean requestBean) {
...@@ -168,10 +168,11 @@ public class RouteVerifyController { ...@@ -168,10 +168,11 @@ public class RouteVerifyController {
VerifyCheckBean bean = requestBean.getObjectBean(VerifyCheckBean.class); VerifyCheckBean bean = requestBean.getObjectBean(VerifyCheckBean.class);
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if("00".equals(bean.getVerifyStatus())){ if ("00".equals(bean.getVerifyStatus())) {
message="非法提交，请选择论证意见"; message = "非法提交，请选择论证意见";
} }
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
try { try {
routeVerifyService.updateCheckStatus(bean); routeVerifyService.updateCheckStatus(bean);
} catch (Exception e) { } catch (Exception e) {
...@@ -185,56 +186,58 @@ public class RouteVerifyController { ...@@ -185,56 +186,58 @@ public class RouteVerifyController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
public static void main(String[] args) { public static void main(String[] args) {
String content = "<p>\r\n\t&lt;p&gt; &amp;lt;p&amp;gt; &amp;amp;lt;p style=&amp;amp;quot;text-indent:20pt;&amp;amp;quot;&amp;amp;gt; 6月30日，在首届世界智能大会的&amp;amp;amp;amp;ldquo;智能城市与社会论坛&amp;amp;amp;amp;rdquo;上，中新天津生态城管委会与太极计算机股份有限公司、中国智慧城市产业技术创新战略联盟、中国软件行业协会三家单位签署战略合作协议。今后，生态城将与各方在智慧城市建设等领域展开全方位战略合作，共同推进智慧民生、智慧管理和智慧经济快速发展。作为智能领域全球首个大型高端交流平台，世界智能大会不仅致力于打造世界级先进智能科技成果发布平台、创新合作平台、产业聚集平台和投融资对接平台，更重在智能领域促进中国与世界的交流合作，将先进的科技成果和发展理念引入国内。此次由中新天津生态城承办的&amp;amp;amp;amp;ldquo;智慧城市与社会论坛;，正是在创新、协调、绿色、开放、共享发展理念不断深入，城市与社会被赋予新内涵、新要求的大背景下，展开的一场以&amp;amp;amp;amp;ldquo;智慧城市与社会&amp;amp;amp;amp;rdquo;为主题的观点交锋和头脑风暴。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;会议邀请到中国工程院院士李伯虎、阿里巴巴集团副总裁刘松、世界工程组织联合会（WFEO）当选主席Marlene Kanga等10余位国内外嘉宾，以主题演讲和高峰对话等形式，深入探讨了&amp;amp;amp;amp;ldquo;人工智能2.0&amp;amp;amp;amp;rdquo;、&amp;amp;amp;amp;ldquo;智能化思维构建行业大脑&amp;amp;amp;amp;rdquo;、&amp;amp;amp;amp;ldquo;智慧城市行业中智能技术的应用&amp;amp;amp;amp;rdquo;等热点话题，分享新型智慧城市规划、建设与管理运营理念,以及城市智慧治理与社会服务创新的相关成果，为200多位与会者献上了一场精彩的观点盛宴。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;论坛上，中新天津生态城管委会与太极计算机股份有限公司、中国智慧城市产业技术创新战略联盟、中国软件行业协会三家单位签署战略合作协议，将在智慧城市运营管理，生态城大数据分析，推动科技、信息产业园区建设，共享产业专家智库等方面加强合作。双方今后将积极探索生态城的智慧城市建设、运营、管理新模式，以科技信息手段，助力生态城智慧城市体系建设，推动城市管理向立体化、精细化发展。与此同时，三家单位将充分发挥在各自领域的优势，结合生态城的发展实际和未来需求，推荐品牌企业入驻，通过建设具有国际领先水平的智慧城市智库、研发中心、创新创业基地、示范和体验基地，促进政、产、学、研、用等合作，推动技术创新成果产业转化，加速生态城智慧城市体系建设和产业转型升级。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;作为中国、新加坡两国政府间的战略性合作项目，中新天津生态城一直致力于提升现有城市发展和服务水平，通过智慧城市综合应用中心、智慧城市大数据平台等项目，推动城市发展。生态城智慧城市项目自启动以来，各项目进展顺利。此次生态城与三家单位签署战略合作协议，将提高政府行政管理和服务能力，促进经济转型升级、培育智慧经济，加快生态城的智慧城市建设步伐。&amp;amp;amp;lt;/p&amp;amp;amp;gt;&amp;amp;lt;/p&amp;amp;gt;&amp;lt;/p&amp;gt;&lt;/p&gt;</p>"; String content = "<p>\r\n\t&lt;p&gt; &amp;lt;p&amp;gt; &amp;amp;lt;p style=&amp;amp;quot;text-indent:20pt;&amp;amp;quot;&amp;amp;gt; 6月30日，在首届世界智能大会的&amp;amp;amp;amp;ldquo;智能城市与社会论坛&amp;amp;amp;amp;rdquo;上，中新天津生态城管委会与太极计算机股份有限公司、中国智慧城市产业技术创新战略联盟、中国软件行业协会三家单位签署战略合作协议。今后，生态城将与各方在智慧城市建设等领域展开全方位战略合作，共同推进智慧民生、智慧管理和智慧经济快速发展。作为智能领域全球首个大型高端交流平台，世界智能大会不仅致力于打造世界级先进智能科技成果发布平台、创新合作平台、产业聚集平台和投融资对接平台，更重在智能领域促进中国与世界的交流合作，将先进的科技成果和发展理念引入国内。此次由中新天津生态城承办的&amp;amp;amp;amp;ldquo;智慧城市与社会论坛;，正是在创新、协调、绿色、开放、共享发展理念不断深入，城市与社会被赋予新内涵、新要求的大背景下，展开的一场以&amp;amp;amp;amp;ldquo;智慧城市与社会&amp;amp;amp;amp;rdquo;为主题的观点交锋和头脑风暴。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;会议邀请到中国工程院院士李伯虎、阿里巴巴集团副总裁刘松、世界工程组织联合会（WFEO）当选主席Marlene Kanga等10余位国内外嘉宾，以主题演讲和高峰对话等形式，深入探讨了&amp;amp;amp;amp;ldquo;人工智能2.0&amp;amp;amp;amp;rdquo;、&amp;amp;amp;amp;ldquo;智能化思维构建行业大脑&amp;amp;amp;amp;rdquo;、&amp;amp;amp;amp;ldquo;智慧城市行业中智能技术的应用&amp;amp;amp;amp;rdquo;等热点话题，分享新型智慧城市规划、建设与管理运营理念,以及城市智慧治理与社会服务创新的相关成果，为200多位与会者献上了一场精彩的观点盛宴。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;论坛上，中新天津生态城管委会与太极计算机股份有限公司、中国智慧城市产业技术创新战略联盟、中国软件行业协会三家单位签署战略合作协议，将在智慧城市运营管理，生态城大数据分析，推动科技、信息产业园区建设，共享产业专家智库等方面加强合作。双方今后将积极探索生态城的智慧城市建设、运营、管理新模式，以科技信息手段，助力生态城智慧城市体系建设，推动城市管理向立体化、精细化发展。与此同时，三家单位将充分发挥在各自领域的优势，结合生态城的发展实际和未来需求，推荐品牌企业入驻，通过建设具有国际领先水平的智慧城市智库、研发中心、创新创业基地、示范和体验基地，促进政、产、学、研、用等合作，推动技术创新成果产业转化，加速生态城智慧城市体系建设和产业转型升级。&amp;amp;amp;lt;/p&amp;amp;amp;gt; &amp;amp;amp;lt;p style=&amp;amp;amp;quot;margin: 8px auto auto; padding: inherit; clear: both; line-height: 26px; color: rgb(128, 128, 128); font-family: Verdana, Arial, sans-serif, &amp;amp;amp;amp;quot;Times New Roman&amp;amp;amp;amp;quot;, 宋体; white-space: normal;&amp;amp;amp;quot;&amp;amp;amp;gt; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp; &amp;amp;amp;amp;nbsp;作为中国、新加坡两国政府间的战略性合作项目，中新天津生态城一直致力于提升现有城市发展和服务水平，通过智慧城市综合应用中心、智慧城市大数据平台等项目，推动城市发展。生态城智慧城市项目自启动以来，各项目进展顺利。此次生态城与三家单位签署战略合作协议，将提高政府行政管理和服务能力，促进经济转型升级、培育智慧经济，加快生态城的智慧城市建设步伐。&amp;amp;amp;lt;/p&amp;amp;amp;gt;&amp;amp;lt;/p&amp;amp;gt;&amp;lt;/p&amp;gt;&lt;/p&gt;</p>";
if(content!=null&& content.indexOf(">")!=-1&&content.lastIndexOf("<")!=-1 && content.indexOf(">")<content.lastIndexOf("<")){ if (content != null && content.indexOf(">") != -1 && content.lastIndexOf("<") != -1 && content.indexOf(">") < content.lastIndexOf("<")) {
content = content.substring(content.indexOf(">")+1, content.lastIndexOf("<")); content = content.substring(content.indexOf(">") + 1, content.lastIndexOf("<"));
} }
System.out.println(content); System.out.println(content);
} }
//论证意见 //论证意见
@ResponseBody @ResponseBody
@RequestMapping(value = "/update") @RequestMapping(value = "/update")
public ResponseBean updateVerifyStatus(HttpServletRequest request ) { public ResponseBean updateVerifyStatus(HttpServletRequest request) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
RequestBean requestBean=new RequestBean(); RequestBean requestBean = new RequestBean();
String content=request.getParameter("content"); String content = request.getParameter("content");
String sign=request.getParameter("sign"); String sign = request.getParameter("sign");
String formText=request.getParameter("formText"); String formText = request.getParameter("formText");
formText= formText.replaceAll("\\%26", "&"); formText = formText.replaceAll("\\%26", "&");
formText= formText.replaceAll("\\%2B", "+"); formText = formText.replaceAll("\\%2B", "+");
formText= formText.replaceAll("\\%2F", "/"); formText = formText.replaceAll("\\%2F", "/");
formText= formText.replaceAll("\\%3F", "?"); formText = formText.replaceAll("\\%3F", "?");
formText= formText.replaceAll("\\%25", "%"); formText = formText.replaceAll("\\%25", "%");
formText= formText.replaceAll("\\%23", "#"); formText = formText.replaceAll("\\%23", "#");
formText= formText.replaceAll("\\%3D", ","); formText = formText.replaceAll("\\%3D", ",");
// parse_form= parse_form.replaceAll("\\-\\|\\}", ""); // parse_form= parse_form.replaceAll("\\-\\|\\}", "");
requestBean.setContent(content); requestBean.setContent(content);
requestBean.setSign(sign); requestBean.setSign(sign);
VerifyStatusBean bean = requestBean.getObjectBean(VerifyStatusBean.class); VerifyStatusBean bean = requestBean.getObjectBean(VerifyStatusBean.class);
if(StringUtils.isNotBlank(formText) && StringUtils.isBlank(bean.getFormText())){ if (StringUtils.isNotBlank(formText) && StringUtils.isBlank(bean.getFormText())) {
bean.setFormText(formText); bean.setFormText(formText);
} }
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if("1".equals(bean.getStatus())&&"00".equals(bean.getVerifyStatus())){ if ("1".equals(bean.getStatus()) && "00".equals(bean.getVerifyStatus())) {
message="非法提交，请选择论证意见"; message = "非法提交，请选择论证意见";
} }
if(message == null){// 通过参数校验 if (message == null) {// 通过参数校验
try { try {
if(!routeVerifyService.updateVerifyStatus(bean)){ if (!routeVerifyService.updateVerifyStatus(bean)) {
responseBean.setMessage("已提交数据，不允许进行保存操作！"); responseBean.setMessage("已提交数据，不允许进行保存操作！");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
return responseBean; return responseBean;
} }
if("1".equals(bean.getStatus())){ if ("1".equals(bean.getStatus())) {
routeVerifyService.sendmail(bean); routeVerifyService.sendmail(bean);
} }
// 参数校验为通过 // 参数校验为通过
...@@ -242,73 +245,75 @@ public class RouteVerifyController { ...@@ -242,73 +245,75 @@ public class RouteVerifyController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
//修改论证报告单
//修改论证报告单
@ResponseBody @ResponseBody
@RequestMapping(value = "/updateReport") @RequestMapping(value = "/updateReport")
public ResponseBean updateReport(HttpServletRequest request ) throws Exception { public ResponseBean updateReport(HttpServletRequest request) throws Exception {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
RequestBean requestBean=new RequestBean(); RequestBean requestBean = new RequestBean();
String content=request.getParameter("content"); String content = request.getParameter("content");
String sign=request.getParameter("sign"); String sign = request.getParameter("sign");
String formText=request.getParameter("formText"); String formText = request.getParameter("formText");
formText= formText.replaceAll("\\%26", "&"); formText = formText.replaceAll("\\%26", "&");
formText= formText.replaceAll("\\%2B", "+"); formText = formText.replaceAll("\\%2B", "+");
formText= formText.replaceAll("\\%2F", "/"); formText = formText.replaceAll("\\%2F", "/");
formText= formText.replaceAll("\\%3F", "?"); formText = formText.replaceAll("\\%3F", "?");
formText= formText.replaceAll("\\%25", "%"); formText = formText.replaceAll("\\%25", "%");
formText= formText.replaceAll("\\%23", "#"); formText = formText.replaceAll("\\%23", "#");
formText= formText.replaceAll("\\%3D", ","); formText = formText.replaceAll("\\%3D", ",");
// parse_form= parse_form.replaceAll("\\-\\|\\}", ""); // parse_form= parse_form.replaceAll("\\-\\|\\}", "");
requestBean.setContent(content); requestBean.setContent(content);
requestBean.setSign(sign); requestBean.setSign(sign);
VerifyStatusBean bean = requestBean.getObjectBean(VerifyStatusBean.class); VerifyStatusBean bean = requestBean.getObjectBean(VerifyStatusBean.class);
if(StringUtils.isNotBlank(formText) && StringUtils.isBlank(bean.getFormText())){ if (StringUtils.isNotBlank(formText) && StringUtils.isBlank(bean.getFormText())) {
bean.setFormText(formText); bean.setFormText(formText);
} }
String message = routeVerifyService.validate(bean); String message = routeVerifyService.validate(bean);
if(message == null){// 通过参数校验 if (message == null) {// 通过参数校验
routeVerifyService.updateReport(bean); routeVerifyService.updateReport(bean);
// 参数校验为通过 // 参数校验为通过
responseBean.setMessage(GConstants.OK); responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000); responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean; return responseBean;
} }
// 参数校验为通过 // 参数校验为通过
responseBean.setMessage(message); responseBean.setMessage(message);
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping(value = "/export") @RequestMapping(value = "/export")
public void export(RequestBean requestBean,HttpServletResponse response){ public void export(RequestBean requestBean, HttpServletResponse response) {
/* PageEntity<AirlineVerifyEntity> list = null;*/ /* PageEntity<AirlineVerifyEntity> list = null;*/
AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class); AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
String message = airlineVerifyService.validate(bean); String message = airlineVerifyService.validate(bean);
if(message == null){// 通过参数校验 if (message == null) {// 通过参数校验
/* list = airlineVerifyService.getRiskAssessmentListForExcel(bean); /* list = airlineVerifyService.getRiskAssessmentListForExcel(bean);
List<AirlineVerifyEntity> list1= list.getList(); List<AirlineVerifyEntity> list1= list.getList();
if(list1==null)list1=new ArrayList<AirlineVerifyEntity>();*/ if(list1==null)list1=new ArrayList<AirlineVerifyEntity>();*/
bean.setPageNo(1); bean.setPageNo(1);
bean.setPageSize(10000); bean.setPageSize(10000);
PageEntity<AirlineVerifyEntity> page =airlineVerifyService.getRiskAssessmentList(bean); PageEntity<AirlineVerifyEntity> page = airlineVerifyService.getRiskAssessmentList(bean);
List<AirlineVerifyEntity> list=new ArrayList<AirlineVerifyEntity>(); List<AirlineVerifyEntity> list = new ArrayList<AirlineVerifyEntity>();
if(page!=null&&page.getList()!=null) list=page.getList(); if (page != null && page.getList() != null) list = page.getList();
String fileName = "待论证航线列表"+ new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())+".xlsx"; String fileName = "待论证航线列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx";
try { try {
new ExportExcel("待论证航线列表", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose(); new ExportExcel("待论证航线列表", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
/*return ;*/ /*return ;*/
} }
/* return ;*/ /* return ;*/
}
} }
/* return ;*/
} }
/* return ;*/
}
src/com/ejweb/modules/route/bean/VerifyCheckBean.java
package com.ejweb.modules.route.bean; package com.ejweb.modules.route.bean;
import com.ejweb.modules.verify.entity.FullVerifyConditionEntity;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean; import com.ejweb.core.base.GenericBean;
import java.util.List;
public class VerifyCheckBean extends GenericBean { public class VerifyCheckBean extends GenericBean {
@NotEmpty(message="verifyStatus字段不能为空") @NotEmpty(message="verifyStatus字段不能为空")
...@@ -21,6 +24,8 @@ public class VerifyCheckBean extends GenericBean { ...@@ -21,6 +24,8 @@ public class VerifyCheckBean extends GenericBean {
private String userCode; //用户ID private String userCode; //用户ID
private String condition; //verifyStatus为02、03时必填 private String condition; //verifyStatus为02、03时必填
private List<FullVerifyConditionEntity> conditions;
private String complete; private String complete;
@NotEmpty(message="verifId字段不能为空") @NotEmpty(message="verifId字段不能为空")
...@@ -67,5 +72,11 @@ public class VerifyCheckBean extends GenericBean { ...@@ -67,5 +72,11 @@ public class VerifyCheckBean extends GenericBean {
this.conditionId = conditionId; this.conditionId = conditionId;
} }
public List<FullVerifyConditionEntity> getConditions() {
return conditions;
}
public void setConditions(List<FullVerifyConditionEntity> conditions) {
this.conditions = conditions;
}
} }
src/com/ejweb/modules/route/bean/VerifyStatusBean.java
package com.ejweb.modules.route.bean; package com.ejweb.modules.route.bean;
import com.ejweb.core.base.GenericBean; import com.ejweb.core.base.GenericBean;
import com.ejweb.modules.verify.entity.FullVerifyConditionEntity;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import java.util.List; import java.util.List;
...@@ -22,6 +23,8 @@ public class VerifyStatusBean extends GenericBean { ...@@ -22,6 +23,8 @@ public class VerifyStatusBean extends GenericBean {
private String userCode; //用户ID private String userCode; //用户ID
private String condition; //verifyStatus为02、03时必填 private String condition; //verifyStatus为02、03时必填
private List<FullVerifyConditionEntity> conditions;
private String formText; //自定义表单内容 private String formText; //自定义表单内容
...@@ -97,6 +100,12 @@ public class VerifyStatusBean extends GenericBean { ...@@ -97,6 +100,12 @@ public class VerifyStatusBean extends GenericBean {
public void setRouteFile(List<Map<String, String>> routeFile) { public void setRouteFile(List<Map<String, String>> routeFile) {
this.routeFile = routeFile; this.routeFile = routeFile;
} }
public List<FullVerifyConditionEntity> getConditions() {
return conditions;
}
public void setConditions(List<FullVerifyConditionEntity> conditions) {
this.conditions = conditions;
}
} }
src/com/ejweb/modules/route/dao/RouteVerifyDao.java
...@@ -10,6 +10,7 @@ import com.ejweb.modules.route.bean.RouteVerifyBean; ...@@ -10,6 +10,7 @@ import com.ejweb.modules.route.bean.RouteVerifyBean;
import com.ejweb.modules.route.bean.RouteVerifyDetailBean; import com.ejweb.modules.route.bean.RouteVerifyDetailBean;
import com.ejweb.modules.route.bean.VerifyStatusBean; import com.ejweb.modules.route.bean.VerifyStatusBean;
import com.ejweb.modules.route.entity.FullRouteVerifyEntity; import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
import com.ejweb.modules.route.entity.RouteVerifyDetailEntity;
import com.ejweb.modules.route.entity.RouteVerifyEntity; import com.ejweb.modules.route.entity.RouteVerifyEntity;
import com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean; import com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean;
import com.ejweb.modules.verify.entity.RouteverifyEntity; import com.ejweb.modules.verify.entity.RouteverifyEntity;
...@@ -20,7 +21,7 @@ public interface RouteVerifyDao extends BaseDao{ ...@@ -20,7 +21,7 @@ public interface RouteVerifyDao extends BaseDao{
List<FullRouteVerifyEntity> fullList(RouteVerifyBean bean); List<FullRouteVerifyEntity> fullList(RouteVerifyBean bean);
RouteVerifyEntity detail(RouteVerifyDetailBean bean); RouteVerifyEntity detail(RouteVerifyDetailBean bean);
/** /**
* 根据id获取foc_route_verify数据，userCode获取depart_id与本数据的depart_id比较 * 根据id获取foc_route_verify数据，userCode获取depart_id与本数据的depart_id比较
......
src/com/ejweb/modules/route/entity/RouteVerifyDetailEntity.java 0 → 100644
package com.ejweb.modules.route.entity;
import com.ejweb.modules.verify.data.ConditionDetailData;
import java.util.List;
import java.util.Map;
/**
* @Author: lisu
* @Date: 2020/3/29 19:00
* @Description: java类作用描述
*/
public class RouteVerifyDetailEntity {
private String id;
private String verifId;
private String verifyStatus;
private String departId;
private String depName;
private String verifType;
private String departName;
private String formText;
private String remarks;
//状态 0 草稿 1 发布
private String status;
private List<ConditionDetailData> conditions;
private List<Map<String, String>> routeFile;
private List<Map<String, String>> history;
public List<Map<String, String>> getHistory() {
return history;
}
public void setHistory(List<Map<String, String>> history) {
this.history = history;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
public String getVerifType() {
return verifType;
}
public void setVerifType(String verifType) {
this.verifType = verifType;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getVerifId() {
return verifId;
}
public void setVerifId(String verifId) {
this.verifId = verifId;
}
public String getVerifyStatus() {
return verifyStatus;
}
public void setVerifyStatus(String verifyStatus) {
this.verifyStatus = verifyStatus;
}
public String getDepartId() {
return departId;
}
public void setDepartId(String departId) {
this.departId = departId;
}
public String getFormText() {
return formText;
}
public void setFormText(String formText) {
this.formText = formText;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public String getDepartName() {
return departName;
}
public void setDepartName(String departName) {
this.departName = departName;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public List<Map<String, String>> getRouteFile() {
return routeFile;
}
public void setRouteFile(List<Map<String, String>> routeFile) {
this.routeFile = routeFile;
}
public List<ConditionDetailData> getConditions() {
return conditions;
}
public void setConditions(List<ConditionDetailData> conditions) {
this.conditions = conditions;
}
}
src/com/ejweb/modules/route/service/RouteVerifyService.java
...@@ -15,12 +15,14 @@ import com.ejweb.modules.notify.dao.NotifyDao; ...@@ -15,12 +15,14 @@ import com.ejweb.modules.notify.dao.NotifyDao;
import com.ejweb.modules.route.bean.*; import com.ejweb.modules.route.bean.*;
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.entity.RouteVerifyDetailEntity;
import com.ejweb.modules.route.entity.RouteVerifyEntity; import com.ejweb.modules.route.entity.RouteVerifyEntity;
import com.ejweb.modules.user.dao.UserDao; import com.ejweb.modules.user.dao.UserDao;
import com.ejweb.modules.user.entity.User; import com.ejweb.modules.user.entity.User;
import com.ejweb.modules.user.entity.UserEntity; import com.ejweb.modules.user.entity.UserEntity;
import com.ejweb.modules.verify.bean.*; import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.dao.*; import com.ejweb.modules.verify.dao.*;
import com.ejweb.modules.verify.data.ConditionDetailData;
import com.ejweb.modules.verify.entity.AirlineVerifyEntity; import com.ejweb.modules.verify.entity.AirlineVerifyEntity;
import com.ejweb.modules.verify.entity.FullVerifyConditionEntity; import com.ejweb.modules.verify.entity.FullVerifyConditionEntity;
import com.ejweb.modules.verify.entity.FullVerifyFormEntity; import com.ejweb.modules.verify.entity.FullVerifyFormEntity;
...@@ -30,12 +32,15 @@ import com.github.pagehelper.PageInfo; ...@@ -30,12 +32,15 @@ import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException; import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -49,6 +54,8 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -49,6 +54,8 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
@Autowired @Autowired
VerifyConditionDao verifyConditionDao; VerifyConditionDao verifyConditionDao;
@Autowired
ConditionDao conditionDao;
@Autowired @Autowired
AirlineConclusionDao airlineConclusionDao; AirlineConclusionDao airlineConclusionDao;
...@@ -103,20 +110,34 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -103,20 +110,34 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
return page; return page;
} }
public RouteVerifyEntity detail(RouteVerifyDetailBean bean) { public RouteVerifyDetailEntity detail(RouteVerifyDetailBean bean) {
RouteVerifyEntity entity = dao.detail(bean); RouteVerifyEntity entity = dao.detail(bean);
//因为之前的数据类太多地方引用，所以重新写数据类
RouteVerifyDetailEntity detailEntity = new RouteVerifyDetailEntity();
BeanUtils.copyProperties(entity, detailEntity);
//不可行或者条件可行时，查询条件
if (!"01".equals(entity.getVerifyStatus())) {
List<ConditionDetailData> conditions = conditionDao.findByVerifyIdAndDepartId(bean.getVerifId(), bean.getDepartId());
List<ConditionDetailData> conditionList = new ArrayList<>();
if (!CollectionUtils.isEmpty(conditions)) {
for (ConditionDetailData data : conditions) {
VerifyFeedbackDetailBean bean1 = new VerifyFeedbackDetailBean();
bean1.setConditionId(data.getConditionId());
data.setDepartIds(feeddao.getDetailList(bean1));
conditionList.add(data);
}
}
detailEntity.setConditions(conditionList);
}
Map<String, String> map = verifyDao.getDetail(bean.getVerifId()); Map<String, String> map = verifyDao.getDetail(bean.getVerifId());
map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype"))); map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype"))); map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
entity.setDepName(map.get("depName")); detailEntity.setDepName(map.get("depName"));
entity.setVerifType(map.get("verifType")); detailEntity.setVerifType(map.get("verifType"));
entity.setRouteFile(dao.getRouteFileList(entity)); detailEntity.setRouteFile(dao.getRouteFileList(entity));
entity.setHistory(verifyDao.getHistoryList(entity.getId())); detailEntity.setHistory(verifyDao.getHistoryList(entity.getId()));
if (StringUtils.isNoneBlank(entity.getConditionId())) {
VerifyFeedbackDetailBean bean1 = new VerifyFeedbackDetailBean();
bean1.setConditionId(entity.getConditionId());
entity.setDepartIds(feeddao.getDetailList(bean1));
}
if (StringUtils.isBlank(entity.getFormText())) { if (StringUtils.isBlank(entity.getFormText())) {
AirlineVerifyEntity airlineVerifyEntity = airlineVerifyDao AirlineVerifyEntity airlineVerifyEntity = airlineVerifyDao
.selectByPrimaryKey(bean.getVerifId()); .selectByPrimaryKey(bean.getVerifId());
...@@ -130,17 +151,17 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -130,17 +151,17 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
if (fullVerifyFormEntities != null) { if (fullVerifyFormEntities != null) {
if (fullVerifyFormEntities.size() == 1) { if (fullVerifyFormEntities.size() == 1) {
FullVerifyFormEntity fullVerifyFormEntity = fullVerifyFormEntities.get(0); FullVerifyFormEntity fullVerifyFormEntity = fullVerifyFormEntities.get(0);
entity.setFormText(fullVerifyFormEntity.getFormText()); detailEntity.setFormText(fullVerifyFormEntity.getFormText());
} else if (fullVerifyFormEntities.size() > 1) { } else if (fullVerifyFormEntities.size() > 1) {
FullVerifyFormEntity fullVerifyFormEntity = fullVerifyFormEntities.get(0); FullVerifyFormEntity fullVerifyFormEntity = fullVerifyFormEntities.get(0);
entity.setFormText(fullVerifyFormEntity.getFormText()); detailEntity.setFormText(fullVerifyFormEntity.getFormText());
} }
} }
} }
return entity; return detailEntity;
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
...@@ -252,9 +273,11 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -252,9 +273,11 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
// 论证意见为条件可行或不可行 // 论证意见为条件可行或不可行
if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) { if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
String cid = IdWorker.getNextId(); for (FullVerifyConditionEntity condition : bean.getConditions()) {
this.insertVerifyConditionChild(cid, verifyStatus, fullRouteVerifyEntity.getVerifId(), null, String cid = IdWorker.getNextId();
bean.getUserCode(), fullRouteVerifyEntity.getId(), null); condition.setId(cid);
this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
}
NotifyAddBean addbean = new NotifyAddBean(); NotifyAddBean addbean = new NotifyAddBean();
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
...@@ -266,7 +289,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -266,7 +289,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
StringBuffer url = new StringBuffer(); StringBuffer url = new StringBuffer();
url.append("<<<a href='argument-condition-estimate-check-details.htm?verifId=").append(bean.getVerifId()); url.append("<<<a href='argument-condition-estimate-check-details.htm?verifId=").append(bean.getVerifId());
url.append("&verifNo=").append(map.get("verifNo")); url.append("&verifNo=").append(map.get("verifNo"));
url.append("&cid=").append(cid); // url.append("&cid=").append(cid);
url.append("'>点击查看</a>"); url.append("'>点击查看</a>");
addbean.setUrl(url.toString()); addbean.setUrl(url.toString());
addbean.setType("6"); addbean.setType("6");
...@@ -278,8 +301,8 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -278,8 +301,8 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
addbean.setUpdateDate(new Date()); addbean.setUpdateDate(new Date());
addbean.setId(IdWorker.getNextId()); addbean.setId(IdWorker.getNextId());
addbean.setDepartId("e4q231wdfdfkukjqe53457dgfdhdfhd"); addbean.setDepartId("e4q231wdfdfkukjqe53457dgfdhdfhd");
addbean.setVerifId(cid); addbean.setVerifId(bean.getVerifId());
addbean.setConId(bean.getVerifId()); // addbean.setConId(bean.getVerifId());
notifyDao.saveNotify(addbean); notifyDao.saveNotify(addbean);
} }
} }
...@@ -343,7 +366,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -343,7 +366,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
private void updateRouteVerify(FullRouteVerifyEntity fullRouteVerifyEntity, VerifyStatusBean bean) { private void updateRouteVerify(FullRouteVerifyEntity fullRouteVerifyEntity, VerifyStatusBean bean) {
fullRouteVerifyEntity.setRemarks(bean.getRemarks()); fullRouteVerifyEntity.setRemarks(bean.getRemarks());
fullRouteVerifyEntity.setVerifyStatus(bean.getVerifyStatus()); fullRouteVerifyEntity.setVerifyStatus(bean.getVerifyStatus());
fullRouteVerifyEntity.setCondition(bean.getCondition()); // fullRouteVerifyEntity.setCondition(bean.getCondition());
fullRouteVerifyEntity.setFormText(bean.getFormText()); fullRouteVerifyEntity.setFormText(bean.getFormText());
fullRouteVerifyEntity.setStatus(bean.getStatus()); fullRouteVerifyEntity.setStatus(bean.getStatus());
fullRouteVerifyEntity.setUpdateDate(new Date()); fullRouteVerifyEntity.setUpdateDate(new Date());
...@@ -425,7 +448,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -425,7 +448,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
private void insertVerifyConditionChild(String id, String verifyStatus, String verifId, String verifyConditionId, private void insertVerifyConditionChild(String id, String verifyStatus, String verifId, String verifyConditionId,
String userCode, String routeId, String remarks) { String userCode, String routeId, String remarks, String condition) {
FullVerifyConditionEntity verifyConditionEntityNew = new FullVerifyConditionEntity(); FullVerifyConditionEntity verifyConditionEntityNew = new FullVerifyConditionEntity();
verifyConditionEntityNew.setId(id); verifyConditionEntityNew.setId(id);
...@@ -439,11 +462,27 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -439,11 +462,27 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
verifyConditionEntityNew.setComplete("0"); verifyConditionEntityNew.setComplete("0");
verifyConditionEntityNew.setIsFeed("0"); verifyConditionEntityNew.setIsFeed("0");
verifyConditionEntityNew.setRouteId(routeId); verifyConditionEntityNew.setRouteId(routeId);
verifyConditionEntityNew.setCondition(condition);
verifyConditionEntityNew.setDepartId(dao.getDepartId(userCode)); verifyConditionEntityNew.setDepartId(dao.getDepartId(userCode));
verifyConditionEntityNew.setRemarks(remarks); verifyConditionEntityNew.setRemarks(remarks);
verifyConditionDao.insert(verifyConditionEntityNew); verifyConditionDao.insert(verifyConditionEntityNew);
} }
private void addVerifyCondition(FullRouteVerifyEntity routeVerifyEntity, String verifuStatus, String userCode, FullVerifyConditionEntity conditionEntity) {
conditionEntity.setId(conditionEntity.getId());
conditionEntity.setConditionStatus(verifuStatus);
conditionEntity.setVerifId(routeVerifyEntity.getVerifId());
conditionEntity.setCreateBy(userCode);
conditionEntity.setCreateDate(new Date());
conditionEntity.setUpdateBy(userCode);
conditionEntity.setUpdateDate(new Date());
conditionEntity.setComplete("0");
conditionEntity.setIsFeed("0");
conditionEntity.setRouteId(routeVerifyEntity.getId());
conditionEntity.setDepartId(dao.getDepartId(userCode));
verifyConditionDao.insert(conditionEntity);
}
/** /**
* 条件评估提出部门修改可行性意见 * 条件评估提出部门修改可行性意见
...@@ -490,9 +529,14 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -490,9 +529,14 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
} }
// 论证意见为条件可行或不可行 // 论证意见为条件可行或不可行
if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) { if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
String cid = IdWorker.getNextId(); for (FullVerifyConditionEntity condition : bean.getConditions()) {
this.insertVerifyConditionChild(cid, verifyStatus, fullRouteVerifyEntity.getVerifId(), null, String cid = IdWorker.getNextId();
bean.getUserCode(), fullRouteVerifyEntity.getId(), null); condition.setId(cid);
this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
}
// String cid = IdWorker.getNextId();
// this.insertVerifyConditionChild(cid, verifyStatus, fullRouteVerifyEntity.getVerifId(), null,
// bean.getUserCode(), fullRouteVerifyEntity.getId(), null, null);
// 给运控部发通知，进行条件审核 // 给运控部发通知，进行条件审核
NotifyAddBean addbean1 = new NotifyAddBean(); NotifyAddBean addbean1 = new NotifyAddBean();
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
...@@ -507,7 +551,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -507,7 +551,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
StringBuffer url = new StringBuffer(); StringBuffer url = new StringBuffer();
url.append("<<<a href='argument-condition-estimate-check-details.htm?verifId=").append(bean.getVerifId()); url.append("<<<a href='argument-condition-estimate-check-details.htm?verifId=").append(bean.getVerifId());
url.append("&verifNo=").append(map.get("verifNo")); url.append("&verifNo=").append(map.get("verifNo"));
url.append("&cid=").append(cid); // url.append("&cid=").append(cid);
url.append("'>点击查看</a>"); url.append("'>点击查看</a>");
addbean1.setUrl(url.toString()); addbean1.setUrl(url.toString());
addbean1.setType("6"); addbean1.setType("6");
...@@ -519,7 +563,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -519,7 +563,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
addbean1.setUpdateDate(new Date()); addbean1.setUpdateDate(new Date());
addbean1.setId(IdWorker.getNextId()); addbean1.setId(IdWorker.getNextId());
addbean1.setDepartId("e4q231wdfdfkukjqe53457dgfdhdfhd"); addbean1.setDepartId("e4q231wdfdfkukjqe53457dgfdhdfhd");
addbean1.setVerifId(cid); // addbean1.setVerifId(cid);
addbean1.setConId(bean.getVerifId()); addbean1.setConId(bean.getVerifId());
notifyDao.saveNotify(addbean1); notifyDao.saveNotify(addbean1);
} }
......
src/com/ejweb/modules/verify/api/VerifyFeedbackController.java
/** /**
* *
*/ */
package com.ejweb.modules.verify.api; package com.ejweb.modules.verify.api;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ejweb.core.api.RequestBean; import com.ejweb.core.api.RequestBean;
import com.ejweb.core.api.ResponseBean; import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
...@@ -35,6 +21,17 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean; ...@@ -35,6 +21,17 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
import com.ejweb.modules.verify.entity.VerifyFeedbackEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
import com.ejweb.modules.verify.service.VerifyFeedbackService; import com.ejweb.modules.verify.service.VerifyFeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/** /**
...@@ -42,20 +39,21 @@ import com.ejweb.modules.verify.service.VerifyFeedbackService; ...@@ -42,20 +39,21 @@ import com.ejweb.modules.verify.service.VerifyFeedbackService;
* @team IT Team * @team IT Team
* @author zhanglg * @author zhanglg
* @version 1.0 * @version 1.0
* @time 2016年9月13日 * @time 2016年9月13日
*/ */
@Controller @Controller
@RequestMapping("/api/verify/feedback") @RequestMapping("/api/verify/feedback")
public class VerifyFeedbackController { public class VerifyFeedbackController {
@Autowired @Autowired
private VerifyFeedbackService feedbackService; private VerifyFeedbackService feedbackService;
@Autowired @Autowired
private RouteVerifyService routeVerifyService; private RouteVerifyService routeVerifyService;
@Autowired @Autowired
private DepartService departService; private DepartService departService;
/** /**
* 获取论证条件评估列表 * 获取论证条件评估列表
* @param requestBean * @param requestBean
...@@ -65,11 +63,13 @@ public class VerifyFeedbackController { ...@@ -65,11 +63,13 @@ public class VerifyFeedbackController {
@RequestMapping("list") @RequestMapping("list")
public ResponseBean list(RequestBean requestBean) { public ResponseBean list(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackBean bean= requestBean.getObjectBean(VerifyFeedbackBean.class); VerifyFeedbackBean bean = requestBean.getObjectBean(VerifyFeedbackBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
PageEntity<VerifyFeedbackEntity> list = feedbackService.findList(bean); PageEntity<VerifyFeedbackEntity> list = feedbackService.findList(bean);
if(list == null){// 查询结果为空 // 查询结果为空
if (list == null) {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -82,16 +82,18 @@ public class VerifyFeedbackController { ...@@ -82,16 +82,18 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping("detail") @RequestMapping("detail")
public ResponseBean detail(RequestBean requestBean) { public ResponseBean detail(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackDetailBean bean=requestBean.getObjectBean(VerifyFeedbackDetailBean.class); VerifyFeedbackDetailBean bean = requestBean.getObjectBean(VerifyFeedbackDetailBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
VerifyFeedbackDetailEntity entity = feedbackService.getDetail(bean); VerifyFeedbackDetailEntity entity = feedbackService.getDetail(bean);
if(entity == null){// 查询结果为空 // 查询结果为空
if (entity == null) {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -104,11 +106,12 @@ public class VerifyFeedbackController { ...@@ -104,11 +106,12 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
/** /**
* 提醒新消息 * 提醒新消息
* *
* @author zhanglg * @author zhanglg
* @time 2016年10月7日 * @time 2016年10月7日
* @param requestBean * @param requestBean
* @return * @return
*/ */
...@@ -116,10 +119,11 @@ public class VerifyFeedbackController { ...@@ -116,10 +119,11 @@ public class VerifyFeedbackController {
@RequestMapping("updateStatus") @RequestMapping("updateStatus")
public ResponseBean updateStatus(RequestBean requestBean) { public ResponseBean updateStatus(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackStatusBean bean=requestBean.getObjectBean(VerifyFeedbackStatusBean.class); VerifyFeedbackStatusBean bean = requestBean.getObjectBean(VerifyFeedbackStatusBean.class);
bean.setStatus("0"); bean.setStatus("0");
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
feedbackService.updateStatus(bean); feedbackService.updateStatus(bean);
return responseBean; return responseBean;
} }
...@@ -128,15 +132,18 @@ public class VerifyFeedbackController { ...@@ -128,15 +132,18 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping("detaillist") @RequestMapping("detailList")
public ResponseBean detaillist(RequestBean requestBean) { public ResponseBean detailList(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackDetailBean bean=requestBean.getObjectBean(VerifyFeedbackDetailBean.class); VerifyFeedbackDetailBean bean = requestBean.getObjectBean(VerifyFeedbackDetailBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
VerifyFeedbackDetailEntity entity = feedbackService.getDetailList(bean); VerifyFeedbackDetailEntity entity = feedbackService.getDetailList(bean);
if(entity == null){// 查询结果为空 // 查询结果为空
if (entity == null) {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
...@@ -149,30 +156,33 @@ public class VerifyFeedbackController { ...@@ -149,30 +156,33 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
/** /**
* 论证条件评估-修改各部门的反馈信息 * 论证条件评估-修改各部门的反馈信息
* *
* @author renmb * @author renmb
* @time 2016年10月4日 * @time 2016年10月4日
* @param requestBean * @param requestBean
* @return * @return
*/ */
@ResponseBody @ResponseBody
@RequestMapping("updateFeedback") @RequestMapping("updateFeedback")
public ResponseBean updateFeedback(RequestBean requestBean){ public ResponseBean updateFeedback(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackUpdateBean bean=requestBean.getObjectBean(VerifyFeedbackUpdateBean.class); VerifyFeedbackUpdateBean bean = requestBean.getObjectBean(VerifyFeedbackUpdateBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
DepartEntity depart = departService.getByUserCode(bean.getUserCode()); DepartEntity depart = departService.getByUserCode(bean.getUserCode());
if(depart != null){ if (depart != null) {
// 设置部门ID
bean.setDepartId(depart.getId());// 设置部门ID bean.setDepartId(depart.getId());
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());
...@@ -185,15 +195,17 @@ public class VerifyFeedbackController { ...@@ -185,15 +195,17 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@ResponseBody @ResponseBody
@RequestMapping("updateRemote") @RequestMapping("updateRemote")
public ResponseBean updateRemote(RequestBean requestBean) throws Exception{ public ResponseBean updateRemote(RequestBean requestBean) throws Exception {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyFeedbackUpdateBean bean=requestBean.getObjectBean(VerifyFeedbackUpdateBean.class); VerifyFeedbackUpdateBean bean = requestBean.getObjectBean(VerifyFeedbackUpdateBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
FullRouteVerifyEntity entity= feedbackService.checkRouteVerifyExist(bean); if (message == null) {
VerifyStatusBean VerifyStatusbean=new VerifyStatusBean(); FullRouteVerifyEntity entity = feedbackService.checkRouteVerifyExist(bean);
VerifyStatusBean VerifyStatusbean = new VerifyStatusBean();
VerifyStatusbean.setVerifId(bean.getVerifId()); VerifyStatusbean.setVerifId(bean.getVerifId());
VerifyStatusbean.setId(entity.getId()); VerifyStatusbean.setId(entity.getId());
VerifyStatusbean.setFormText(entity.getFormText()); VerifyStatusbean.setFormText(entity.getFormText());
...@@ -208,18 +220,21 @@ public class VerifyFeedbackController { ...@@ -208,18 +220,21 @@ public class VerifyFeedbackController {
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
@RequestMapping("export") @RequestMapping("export")
public void export(RequestBean requestBean, HttpServletRequest request, HttpServletResponse response) { public void export(RequestBean requestBean, HttpServletResponse response) {
VerifyFeedbackBean bean= requestBean.getObjectBean(VerifyFeedbackBean.class); VerifyFeedbackBean bean = requestBean.getObjectBean(VerifyFeedbackBean.class);
String message = feedbackService.validate(bean); String message = feedbackService.validate(bean);
if(message == null){// 通过参数校验 // 通过参数校验
if (message == null) {
bean.setPageNo(1); bean.setPageNo(1);
bean.setPageSize(10000); bean.setPageSize(10000);
PageEntity<VerifyFeedbackEntity> page = feedbackService.findList(bean); PageEntity<VerifyFeedbackEntity> page = feedbackService.findList(bean);
List<VerifyFeedbackEntity> list = new ArrayList<VerifyFeedbackEntity>(); List<VerifyFeedbackEntity> list = new ArrayList<VerifyFeedbackEntity>();
if(page!=null&&page.getList()!=null) if (page != null && page.getList() != null) {
list=page.getList(); list = page.getList();
String fileName = "论证条件评估"+ new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())+".xlsx"; }
String fileName = "论证条件评估" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx";
try { try {
new ExportExcel("论证条件评估", VerifyFeedbackEntity.class).setDataList(list).write(response, fileName).dispose(); new ExportExcel("论证条件评估", VerifyFeedbackEntity.class).setDataList(list).write(response, fileName).dispose();
} catch (IOException e) { } catch (IOException e) {
......
src/com/ejweb/modules/verify/bean/ConditionDetailBean.java
...@@ -17,9 +17,10 @@ import com.ejweb.core.base.GenericBean; ...@@ -17,9 +17,10 @@ import com.ejweb.core.base.GenericBean;
public class ConditionDetailBean extends GenericBean { public class ConditionDetailBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0"; public static final String DEL_FLAG_NORMAL = "0";
@NotEmpty(message = "verifId不能为空")
private String verifId; private String verifId;
private String conditionId; @NotEmpty(message = "departId不能为空")
private String departId;
@NotEmpty(message="userCode不能为空") @NotEmpty(message="userCode不能为空")
private String userCode; private String userCode;
public String getVerifId() { public String getVerifId() {
...@@ -28,18 +29,18 @@ public class ConditionDetailBean extends GenericBean { ...@@ -28,18 +29,18 @@ public class ConditionDetailBean extends GenericBean {
public void setVerifId(String verifId) { public void setVerifId(String verifId) {
this.verifId = verifId; this.verifId = verifId;
} }
public String getConditionId() {
return conditionId;
}
public void setConditionId(String conditionId) {
this.conditionId = conditionId;
}
public String getUserCode() { public String getUserCode() {
return userCode; return userCode;
} }
public void setUserCode(String userCode) { public void setUserCode(String userCode) {
this.userCode = userCode; this.userCode = userCode;
} }
public String getDepartId() {
return departId;
}
public void setDepartId(String departId) {
this.departId = departId;
}
} }
src/com/ejweb/modules/verify/dao/ConditionDao.java
/** /**
* *
*/ */
package com.ejweb.modules.verify.dao; package com.ejweb.modules.verify.dao;
import java.util.List;
import java.util.Map;
import com.ejweb.core.base.BaseDao; import com.ejweb.core.base.BaseDao;
import com.ejweb.modules.verify.bean.ConditionBean; import com.ejweb.modules.verify.bean.ConditionBean;
import com.ejweb.modules.verify.bean.ConditionDetailBean; import com.ejweb.modules.verify.bean.ConditionDetailBean;
import com.ejweb.modules.verify.bean.ConditionUpdateBean; import com.ejweb.modules.verify.bean.ConditionUpdateBean;
import com.ejweb.modules.verify.bean.FeedbackAddBean; import com.ejweb.modules.verify.bean.FeedbackAddBean;
import com.ejweb.modules.verify.data.ConditionDetailData;
import com.ejweb.modules.verify.entity.ConditionDetailEntity; import com.ejweb.modules.verify.entity.ConditionDetailEntity;
import com.ejweb.modules.verify.entity.ConditionEntity; import com.ejweb.modules.verify.entity.ConditionEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* *
* @team IT Team * @team IT Team
* @author zhanglg * @author zhanglg
* @version 1.0 * @version 1.0
* @time 2016年9月12日 * @time 2016年9月12日
*/ */
public interface ConditionDao extends BaseDao{ public interface ConditionDao extends BaseDao {
List<ConditionEntity> findList(ConditionBean bean); List<ConditionEntity> findList(ConditionBean bean);
int insertfeedback(FeedbackAddBean feedbean);
int updateFeedback(ConditionUpdateBean bean); int insertfeedback(FeedbackAddBean feedbean);
int deleteFeedback(ConditionUpdateBean bean);
ConditionDetailEntity getDetail(ConditionDetailBean bean); int updateFeedback(ConditionUpdateBean bean);
List<ConditionEntity> findAllList(ConditionBean bean);
Map<String, String> getCondition(String conditionId); int deleteFeedback(ConditionUpdateBean bean);
ConditionDetailEntity getDetail(ConditionDetailBean bean);
List<ConditionDetailData> findByVerifyIdAndDepartId(@Param(value = "verifId") String verifId, @Param(value = "departId") String departId);
List<ConditionEntity> findAllList(ConditionBean bean);
Map<String, String> getCondition(String conditionId);
} }
src/com/ejweb/modules/verify/data/ConditionDetailData.java 0 → 100644
package com.ejweb.modules.verify.data;
import java.util.List;
import java.util.Map;
/**
* @Author: lisu
* @Date: 2020/3/29 14:49
* @Description: java类作用描述
*/
public class ConditionDetailData {
private String conditionId;
private String condition;
private String conditionDate;
private int feedStatus;
private List<Map<String, String>> departIds;
public String getConditionId() {
return conditionId;
}
public void setConditionId(String conditionId) {
this.conditionId = conditionId;
}
public String getCondition() {
return condition;
}
public void setCondition(String condition) {
this.condition = condition;
}
public int getFeedStatus() {
return feedStatus;
}
public void setFeedStatus(int feedStatus) {
this.feedStatus = feedStatus;
}
public String getConditionDate() {
return conditionDate;
}
public void setConditionDate(String conditionDate) {
this.conditionDate = conditionDate;
}
public List<Map<String, String>> getDepartIds() {
return departIds;
}
public void setDepartIds(List<Map<String, String>> departIds) {
this.departIds = departIds;
}
}
src/com/ejweb/modules/verify/entity/ConditionDetailEntity.java
...@@ -5,6 +5,9 @@ package com.ejweb.modules.verify.entity; ...@@ -5,6 +5,9 @@ package com.ejweb.modules.verify.entity;
import com.ejweb.core.base.BaseEntity; import com.ejweb.core.base.BaseEntity;
import com.ejweb.modules.verify.data.ConditionDetailData;
import java.util.List;
/** /**
* 审核详情页 * 审核详情页
...@@ -17,24 +20,17 @@ import com.ejweb.core.base.BaseEntity; ...@@ -17,24 +20,17 @@ import com.ejweb.core.base.BaseEntity;
public class ConditionDetailEntity extends BaseEntity { public class ConditionDetailEntity extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String verifId; private String verifId;
private String conditionId; private String routeId;
private String routeId;
private String departId; // 部门id private String departId; // 部门id
private String departName; // 部门名称 private String departName; // 部门名称
private String condition; // 条件描述
private String verifyStatus; // 论证状态 private String verifyStatus; // 论证状态
private List<ConditionDetailData> conditions;
public String getVerifId() { public String getVerifId() {
return verifId; return verifId;
} }
public void setVerifId(String verifId) { public void setVerifId(String verifId) {
this.verifId = verifId; this.verifId = verifId;
} }
public String getConditionId() {
return conditionId;
}
public void setConditionId(String conditionId) {
this.conditionId = conditionId;
}
public String getRouteId() { public String getRouteId() {
return routeId; return routeId;
} }
...@@ -53,20 +49,25 @@ public class ConditionDetailEntity extends BaseEntity { ...@@ -53,20 +49,25 @@ public class ConditionDetailEntity extends BaseEntity {
public void setDepartName(String departName) { public void setDepartName(String departName) {
this.departName = departName; this.departName = departName;
} }
public String getCondition() {
return condition; // public String getCondition() {
} // return condition;
public void setCondition(String condition) { // }
this.condition = condition; // public void setCondition(String condition) {
} // this.condition = condition;
// }
public String getVerifyStatus() { public String getVerifyStatus() {
return verifyStatus; return verifyStatus;
} }
public void setVerifyStatus(String verifyStatus) { public void setVerifyStatus(String verifyStatus) {
this.verifyStatus = verifyStatus; this.verifyStatus = verifyStatus;
} }
public List<ConditionDetailData> getConditions() {
return conditions;
}
public void setConditions(List<ConditionDetailData> conditions) {
this.conditions = conditions;
}
} }
src/com/ejweb/modules/verify/entity/FullVerifyConditionEntity.java
...@@ -29,6 +29,8 @@ public class FullVerifyConditionEntity { ...@@ -29,6 +29,8 @@ public class FullVerifyConditionEntity {
private String isFeed; private String isFeed;
private String condition;
public String getId() { public String getId() {
return id; return id;
} }
...@@ -132,4 +134,12 @@ public class FullVerifyConditionEntity { ...@@ -132,4 +134,12 @@ public class FullVerifyConditionEntity {
public void setIsFeed(String isFeed) { public void setIsFeed(String isFeed) {
this.isFeed = isFeed; this.isFeed = isFeed;
} }
public String getCondition() {
return condition;
}
public void setCondition(String condition) {
this.condition = condition;
}
} }
\ No newline at end of file
src/com/ejweb/modules/verify/entity/VerifyFeedbackDetailEntity.java
package com.ejweb.modules.verify.entity; package com.ejweb.modules.verify.entity;
import java.util.List;
import java.util.Map;
import com.ejweb.core.base.BaseEntity; import com.ejweb.core.base.BaseEntity;
import com.ejweb.modules.verify.data.ConditionDetailData;
import java.util.List;
/** /**
* 航线论证entity * 航线论证entity
* @author huhy
* *
* @author huhy
*/ */
public class VerifyFeedbackDetailEntity extends BaseEntity { public class VerifyFeedbackDetailEntity extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String verifId; private String verifId;
private String departType; private String departType;
private String condition;
private String verifyStatus; private String verifyStatus;
private String departId; private String departId;
private String verifNo; private String verifNo;
private List<Map<String, String>> departIds; private List<ConditionDetailData> conditions;
public String getVerifId() { public String getVerifId() {
return verifId; return verifId;
} }
public void setVerifId(String verifId) { public void setVerifId(String verifId) {
this.verifId = verifId; this.verifId = verifId;
} }
public String getDepartType() { public String getDepartType() {
return departType; return departType;
} }
public void setDepartType(String departType) { public void setDepartType(String departType) {
this.departType = departType; this.departType = departType;
} }
public String getCondition() {
return condition;
}
public void setCondition(String condition) {
this.condition = condition;
}
public String getVerifyStatus() { public String getVerifyStatus() {
return verifyStatus; return verifyStatus;
} }
public void setVerifyStatus(String verifyStatus) { public void setVerifyStatus(String verifyStatus) {
this.verifyStatus = verifyStatus; this.verifyStatus = verifyStatus;
} }
public List<Map<String, String>> getDepartIds() {
return departIds;
}
public void setDepartIds(List<Map<String, String>> departIds) {
this.departIds = departIds;
}
public String getDepartId() { public String getDepartId() {
return departId; return departId;
} }
public void setDepartId(String departId) { public void setDepartId(String departId) {
this.departId = departId; this.departId = departId;
} }
public String getVerifNo() { public String getVerifNo() {
return verifNo; return verifNo;
} }
public void setVerifNo(String verifNo) { public void setVerifNo(String verifNo) {
this.verifNo = verifNo; this.verifNo = verifNo;
} }
public List<ConditionDetailData> getConditions() {
return conditions;
}
public void setConditions(List<ConditionDetailData> conditions) {
this.conditions = conditions;
}
} }
src/com/ejweb/modules/verify/service/ConditionService.java
...@@ -14,6 +14,7 @@ import com.ejweb.modules.verify.bean.*; ...@@ -14,6 +14,7 @@ import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.bean.ConditionUpdateBean.DepartIds; import com.ejweb.modules.verify.bean.ConditionUpdateBean.DepartIds;
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;
import com.ejweb.modules.verify.data.ConditionDetailData;
import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity; import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity;
import com.ejweb.modules.verify.entity.ConditionDetailEntity; import com.ejweb.modules.verify.entity.ConditionDetailEntity;
import com.ejweb.modules.verify.entity.ConditionEntity; import com.ejweb.modules.verify.entity.ConditionEntity;
...@@ -150,7 +151,12 @@ public class ConditionService extends BaseService<ConditionDao> { ...@@ -150,7 +151,12 @@ public class ConditionService extends BaseService<ConditionDao> {
} }
public ConditionDetailEntity getDetail(ConditionDetailBean bean) { public ConditionDetailEntity getDetail(ConditionDetailBean bean) {
return dao.getDetail(bean); ConditionDetailEntity conditionDetailEntity = dao.getDetail(bean);
if (conditionDetailEntity != null) {
List<ConditionDetailData> conditionDetailData = dao.findByVerifyIdAndDepartId(bean.getVerifId(), bean.getDepartId());
conditionDetailEntity.setConditions(conditionDetailData);
}
return conditionDetailEntity;
} }
/** /**
......
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
/** /**
* *
*/ */
package com.ejweb.modules.verify.service; package com.ejweb.modules.verify.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.ejweb.core.base.BaseService; import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
import com.ejweb.core.exception.RecordNotExistException; import com.ejweb.core.exception.RecordNotExistException;
...@@ -27,45 +17,54 @@ import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity; ...@@ -27,45 +17,54 @@ import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
import com.ejweb.modules.verify.entity.VerifyFeedbackEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* *
* @team IT Team * @team IT Team
* @author zhanglg * @author zhanglg
* @version 1.0 * @version 1.0
* @time 2016年9月13日 * @time 2016年9月13日
*/ */
@Service @Service
@Transactional(readOnly = true) @Transactional(readOnly = true)
public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
@Autowired @Autowired
AirlineVerifyDao verifyDao; AirlineVerifyDao verifyDao;
public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) { public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
PageInfo<VerifyFeedbackEntity> pageInfo = null; PageInfo<VerifyFeedbackEntity> pageInfo = null;
// 必须紧贴dao的查询方法 // 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize()); PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){ if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC"); PageHelper.orderBy(" verifNo DESC");
} } else
else PageHelper.orderBy(bean.getSort());
PageHelper.orderBy(bean.getSort()); List<VerifyFeedbackEntity> list = dao.findlist3(bean);
List<VerifyFeedbackEntity> list=dao.findlist3(bean);
pageInfo = new PageInfo<VerifyFeedbackEntity>(list);
pageInfo = new PageInfo<VerifyFeedbackEntity>(list);
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
return null; return null;
} }
list = pageInfo.getList(); list = pageInfo.getList();
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
return null; return null;
} }
for(VerifyFeedbackEntity entity: list){ for (VerifyFeedbackEntity entity : list) {
List<Map<String, String>> list1= verifyDao.getConnectList(entity.getVerifId()); List<Map<String, String>> list1 = verifyDao.getConnectList(entity.getVerifId());
List<Map<String, String>> list2=new ArrayList<Map<String, String>>(); List<Map<String, String>> list2 = new ArrayList<Map<String, String>>();
for(Map<String, String> map:list1){ for (Map<String, String> map : list1) {
Map<String, String> map2=new HashMap<String, String>(); Map<String, String> map2 = new HashMap<String, String>();
map2.put("flightNo", map.get("flightNo")); map2.put("flightNo", map.get("flightNo"));
map2.put("depIata", map.get("depIata")); map2.put("depIata", map.get("depIata"));
map2.put("arrIata", map.get("arrIata")); map2.put("arrIata", map.get("arrIata"));
...@@ -75,9 +74,9 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{ ...@@ -75,9 +74,9 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
entity.setConnect(list2); entity.setConnect(list2);
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId())); entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setDepName(verifyDao.getConnetList(entity.getVerifId())); entity.setDepName(verifyDao.getConnetList(entity.getVerifId()));
String typelist=verifyDao.getTypeList1(entity.getVerifId()); String typelist = verifyDao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist)) if (StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName()+":"+typelist); entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
} }
PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>(); PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>();
...@@ -88,61 +87,70 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{ ...@@ -88,61 +87,70 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
page.setList(list); page.setList(list);
return page; return page;
} }
public VerifyFeedbackDetailEntity getDetail(VerifyFeedbackDetailBean bean){
if("01".equals(bean.getDepartType())){ public VerifyFeedbackDetailEntity getDetail(VerifyFeedbackDetailBean bean) {
if ("01".equals(bean.getDepartType())) {
return dao.getDetail1(bean); return dao.getDetail1(bean);
}else if("02".equals(bean.getDepartType())){ } else if ("02".equals(bean.getDepartType())) {
return dao.getDetail2(bean); return dao.getDetail2(bean);
}else{ } else {
return null;
}
}
public VerifyFeedbackDetailEntity getDetailList(VerifyFeedbackDetailBean bean) {
VerifyFeedbackDetailEntity feed = dao.getDetail1(bean);
if (feed == null) {
return null; return null;
} }
}
public VerifyFeedbackDetailEntity getDetailList(VerifyFeedbackDetailBean bean){
VerifyFeedbackDetailEntity feed= dao.getDetail1(bean);
if(feed==null) return null;
feed.setDepartIds(dao.getDetailList(bean)); feed.setDepartIds(dao.getDetailList(bean));
return feed; return feed;
} }
public FullRouteVerifyEntity checkRouteVerifyExist(VerifyFeedbackUpdateBean bean){ public FullRouteVerifyEntity checkRouteVerifyExist(VerifyFeedbackUpdateBean bean) {
FullRouteVerifyEntity fullRouteVerifyEntity = dao.checkRouteVerifyExist(bean); FullRouteVerifyEntity fullRouteVerifyEntity = dao.checkRouteVerifyExist(bean);
if(fullRouteVerifyEntity == null) if (fullRouteVerifyEntity == null) {
throw new RecordNotExistException("updateRemote 方法不存在verify_id:" + bean); throw new RecordNotExistException("updateRemote 方法不存在verify_id:" + bean);
}
return fullRouteVerifyEntity; return fullRouteVerifyEntity;
} }
public Boolean updateFeedback(VerifyFeedbackUpdateBean bean){
public Boolean updateFeedback(VerifyFeedbackUpdateBean bean) {
bean.setFeedbackStatus("01"); bean.setFeedbackStatus("01");
int n = dao.updateFeedback(bean); int n = dao.updateFeedback(bean);
if(n==0) if (n == 0) {
return false; return false;
if(dao.getFeedbackStatus(bean)==0){// 所有部门都已经反馈 }
// 所有部门都已经反馈
if (dao.getFeedbackStatus(bean) == 0) {
dao.updateCondition(bean); dao.updateCondition(bean);
} }
return true; return true;
} }
/** /**
* *
* @author zhanglg * @author zhanglg
* @time 2016年9月20日 * @time 2016年9月20日
* @param bean * @param bean
* @return * @return
*/ */
public List<VerifyFeedbackEntity> findAllList(VerifyFeedbackBean bean) { public List<VerifyFeedbackEntity> findAllList(VerifyFeedbackBean bean) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return dao.findAllList(bean); return dao.findAllList(bean);
} }
/** /**
* *
* @author zhanglg * @author zhanglg
* @time 2016年10月7日 * @time 2016年10月7日
* @param bean * @param bean
*/ */
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void updateStatus(VerifyFeedbackStatusBean bean) { public void updateStatus(VerifyFeedbackStatusBean bean) {
dao.updateStatus(bean); dao.updateStatus(bean);
} }
} }
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