Explorar o código

2.5超时预警

jz.kai %!s(int64=2) %!d(string=hai) anos
pai
achega
5d092c2281

+ 4 - 4
common/src/main/java/com/jpsoft/excellent/modules/base/entity/FeedbackOpinion.java

@@ -46,6 +46,10 @@ public class FeedbackOpinion {
     private String[] appendixList;
     private String[] appendixList;
         @ApiModelProperty(value = "处理情况")
         @ApiModelProperty(value = "处理情况")
     private String contentAttachment;
     private String contentAttachment;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @ApiModelProperty(value = "办理期限")
+    private Date allotedDate;
         @ApiModelProperty(value = "是否删除")
         @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
     private Boolean delFlag;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -79,10 +83,6 @@ public class FeedbackOpinion {
     private Boolean isProcessed;
     private Boolean isProcessed;
         @ApiModelProperty(value = "站点回复")
         @ApiModelProperty(value = "站点回复")
     private List<FeedbackStepStatus> stepStatusList;
     private List<FeedbackStepStatus> stepStatusList;
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-    @ApiModelProperty(value = "办理期限")
-    private Date allotedDate;
     @ApiModelProperty(value = "步进状态编号")
     @ApiModelProperty(value = "步进状态编号")
     private String stepStatusId;
     private String stepStatusId;
 }
 }

+ 17 - 3
common/src/main/resources/mapper/base/FeedbackOpinion.xml

@@ -17,6 +17,7 @@
 		<result property="content" column="content_" />
 		<result property="content" column="content_" />
 		<result property="appendix" column="appendix_" />
 		<result property="appendix" column="appendix_" />
 		<result property="contentAttachment" column="content_attachment" />
 		<result property="contentAttachment" column="content_attachment" />
+		<result property="allotedDate" column="alloted_date" />
 		<result property="delFlag" column="del_flag" />
 		<result property="delFlag" column="del_flag" />
 		<result property="createTime" column="create_time" />
 		<result property="createTime" column="create_time" />
 		<result property="createBy" column="create_by" />
 		<result property="createBy" column="create_by" />
@@ -25,7 +26,6 @@
 
 
 		<result property="areaId" column="area_id" />
 		<result property="areaId" column="area_id" />
 		<result property="stationName" column="station_name" />
 		<result property="stationName" column="station_name" />
-		<result property="allotedDate" column="alloted_date" />
 		<result property="stepStatusId" column="step_status_id" />
 		<result property="stepStatusId" column="step_status_id" />
 	</resultMap>
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.excellent.modules.base.entity.FeedbackOpinion">
 	<insert id="insert" parameterType="com.jpsoft.excellent.modules.base.entity.FeedbackOpinion">
@@ -36,7 +36,7 @@
 	-->
 	-->
 	<![CDATA[
 	<![CDATA[
 		insert into base_feedback_opinion
 		insert into base_feedback_opinion
-	    (id_,sort_,connect_,connect_phone,work_station_id,window_,is_satisfied,opinion_status,confirm_status,cause_,content_,appendix_,content_attachment,del_flag,create_time,create_by,update_time,update_by)
+	    (id_,sort_,connect_,connect_phone,work_station_id,window_,is_satisfied,opinion_status,confirm_status,cause_,content_,appendix_,content_attachment,del_flag,create_time,create_by,update_time,update_by,alloted_date)
 		values
 		values
 		(
 		(
 #{id,jdbcType=VARCHAR}
 #{id,jdbcType=VARCHAR}
@@ -57,6 +57,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{allotedDate,jdbcType=VARCHAR}
 		)
 		)
 	]]>
 	]]>
 	</insert>
 	</insert>
@@ -117,6 +118,9 @@
 				<if test="updateBy!=null">
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
 		</if>
+			<if test="allotedDate!=null">
+				alloted_date=#{allotedDate,jdbcType=VARCHAR},
+			</if>
 		</set>
 		</set>
 	where id_=#{id}
 	where id_=#{id}
 	</update>
 	</update>
@@ -184,6 +188,16 @@
 				and a.create_time < #{searchParams.reportDateEnd}
 				and a.create_time < #{searchParams.reportDateEnd}
 				]]>
 				]]>
 			</if>
 			</if>
+			<if test="searchParams.timeout != null">
+				<![CDATA[
+				and a.alloted_date < #{searchParams.timeout}
+				]]>
+			</if>
+			<if test="searchParams.noTimeout != null">
+				<![CDATA[
+				and (a.alloted_date is null or a.alloted_date >= #{searchParams.noTimeout})
+				]]>
+			</if>
 			<if test="searchParams.year != null">
 			<if test="searchParams.year != null">
 				and a.sort_ like #{searchParams.year}
 				and a.sort_ like #{searchParams.year}
 			</if>
 			</if>
@@ -201,7 +215,7 @@
 	</select>
 	</select>
 	<select id="searchTodo" parameterType="hashmap" resultMap="FeedbackOpinionMap">
 	<select id="searchTodo" parameterType="hashmap" resultMap="FeedbackOpinionMap">
 		<![CDATA[
 		<![CDATA[
-			SELECT c.*,a.alloted_date,a.id_ AS step_status_id,d.station_name FROM base_feedback_step_status a
+			SELECT c.*,a.id_ AS step_status_id,d.station_name FROM base_feedback_step_status a
 			LEFT JOIN base_feedback_step b ON a.feedback_step_id = b.id_
 			LEFT JOIN base_feedback_step b ON a.feedback_step_id = b.id_
 			LEFT JOIN base_feedback_opinion c ON b.feedback_opinion_id = c.id_
 			LEFT JOIN base_feedback_opinion c ON b.feedback_opinion_id = c.id_
 			LEFT JOIN base_work_station d on c.work_station_id = d.id_
 			LEFT JOIN base_work_station d on c.work_station_id = d.id_

+ 11 - 1
web/src/main/java/com/jpsoft/excellent/modules/base/controller/FeedbackOpinionController.java

@@ -316,7 +316,7 @@ public class FeedbackOpinionController {
     public MessageResult<Map> pageList(
     public MessageResult<Map> pageList(
             String sort, String connect, String connectPhone, String areaId, String workStation, String window,
             String sort, String connect, String connectPhone, String areaId, String workStation, String window,
             String isSatisfied, String opinionStatus, String confirmStatus, Date[] reportDate,
             String isSatisfied, String opinionStatus, String confirmStatus, Date[] reportDate,
-            Boolean areaSubordinate,
+            Boolean areaSubordinate, String timeout,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
             @RequestAttribute String subject){
@@ -376,6 +376,15 @@ public class FeedbackOpinionController {
                 searchParams.put("confirmStatus", false);
                 searchParams.put("confirmStatus", false);
             }
             }
         }
         }
+        if (StringUtils.isNotEmpty(timeout)) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            if("1".equals(timeout)) {
+                searchParams.put("timeout", sdf.format(new Date()));
+            }
+            if("0".equals(timeout)) {
+                searchParams.put("noTimeout", sdf.format(new Date()));
+            }
+        }
         if (reportDate.length > 0) {
         if (reportDate.length > 0) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             Calendar calendar = new GregorianCalendar();
             Calendar calendar = new GregorianCalendar();
@@ -895,6 +904,7 @@ public class FeedbackOpinionController {
             //反馈意见
             //反馈意见
             FeedbackOpinion feedbackOpinion = feedbackOpinionService.get(feedbackOpinionId);
             FeedbackOpinion feedbackOpinion = feedbackOpinionService.get(feedbackOpinionId);
             feedbackOpinion.setConfirmStatus(true);
             feedbackOpinion.setConfirmStatus(true);
+            feedbackOpinion.setAllotedDate(sdf.parse(allotedDate));
             feedbackOpinionService.update(feedbackOpinion);
             feedbackOpinionService.update(feedbackOpinion);
 
 
             //反馈意见步进
             //反馈意见步进

+ 1 - 1
web/src/main/java/com/jpsoft/excellent/modules/open/OfficeOpinionApiController.java

@@ -78,7 +78,7 @@ public class OfficeOpinionApiController {
                 officeOpinion.setIsSatisfied(false);
                 officeOpinion.setIsSatisfied(false);
 
 
                 String MessageContent = "【双优督办】干部监督评议有一条投诉,请查收。";
                 String MessageContent = "【双优督办】干部监督评议有一条投诉,请查收。";
-                String UserNumber = "13677200818,13647155484,13607214498";
+                String UserNumber = "13677200818,13647155484";
                 SMSUtil.sendSMS(MessageContent, UserNumber, null);
                 SMSUtil.sendSMS(MessageContent, UserNumber, null);
             }
             }
             else{
             else{