1

src/main/java/com/chinaitop/depot/yjbj/controller/StorageTemperaturepointWarningController.java

@@ -39,15 +39,18 @@ public class StorageTemperaturepointWarningController {
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "cfbm", value = "仓房国标编码", paramType = "query"),
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
-        @ApiImplicitParam(name = "alarmType", value = "预警类型 1-测温设备故障 2-测温数据上传故障", required=true, paramType = "query")
+        @ApiImplicitParam(name = "alarmType", value = "预警类型 1-测温设备故障 2-测温数据上传故障", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "approvalStatus", value = "督办状态", paramType = "query"),
+        @ApiImplicitParam(name = "yjzt", value = "预警状态", paramType = "query")
 	})
-	public ResponseEntity getCwdgzPageList(Integer pageNum, Integer pageSize, String cfbm, Integer orgId, Integer alarmType) {
+	public ResponseEntity getCwdgzPageList(Integer pageNum, Integer pageSize, String cfbm, 
+			Integer orgId, Integer alarmType, String approvalStatus, String yjzt) {
 		PageInfo<Sbyj> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<Sbyj> list = storageTemperaturepointWarningService.findByConditions(cfbm, orgId, alarmType);
+			List<Sbyj> list = storageTemperaturepointWarningService.findByConditions(cfbm, orgId, alarmType, approvalStatus, yjzt);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

src/main/java/com/chinaitop/depot/yjbj/mapper/SbyjMapper.xml

@@ -28,21 +28,38 @@
     <result column="supervise_status_name" property="superviseStatusName" jdbcType="VARCHAR" />
     <result column="alarm_type" property="alarmType" jdbcType="INTEGER" />
     <result column="pzbm" property="pzbm" jdbcType="VARCHAR" />
+    <result column="hfzcsj" property="hfzcsj" jdbcType="VARCHAR" />
     <!-- 业务字段 -->
     <result column="storehouse_code" property="houseCode" jdbcType="VARCHAR" />
+    <result column="clordbzt" property="clordbzt" jdbcType="VARCHAR" />
+    <result column="yjzt" property="yjzt" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    a.id, a.kqbm, a.cfbm, a.ch, a.gzcwdsl, a.bjsj, a.create_time, a.update_time, a.kqdm, a.cwdsl, a.gzbl, a.approval_status, 
-    a.approval_status_name, a.data_flag, a.kqmc, a.hwxz, a.hwxzmc, a.org_id, a.org_code, a.duration_days, 
-    a.process_status, a.process_status_name, a.supervise_status, a.supervise_status_name, a.alarm_type, 
-    a.pzbm
+    id, kqbm, cfbm, ch, gzcwdsl, bjsj, create_time, update_time, kqdm, cwdsl, gzbl, approval_status, 
+    approval_status_name, data_flag, kqmc, hwxz, hwxzmc, org_id, org_code, duration_days, 
+    process_status, process_status_name, supervise_status, supervise_status_name, alarm_type, 
+    pzbm, hfzcsj
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="map">
-    select
-    <include refid="Base_Column_List" />
-    ,b.storehouse_code
-    from storage_temperaturepoint_warning a
-    left join basic_storehouse b on b.cfbm=a.cfbm
+    select 
+ 	    *
+	from (
+  		select 
+		    <include refid="Base_Column_List" />,
+		    case approval_status 
+		        when '900000' then '待处理'
+		        when '900001' then '处理中'
+		        when '900002' then '待处理 督办中'
+		        when '900003' then '处理中 督办中'
+		        when '900004' then '督办中'
+		        when '900005' then '二次督办中'
+		        when '900006' then '二次督办完成'
+		        when '999999' then '处理完成'
+		        else ''
+		    end clordbzt,
+		    case when hfzcsj is not null and approval_status = '999999' then '已解决' else'未解决' end yjzt
+		from storage_temperaturepoint_warning
+	) a 
     <where>
       <if test="obj.dataFlag != null">
         and a.data_flag = #{obj.dataFlag,jdbcType=VARCHAR}
@@ -56,6 +73,12 @@
       <if test="obj.orgId != null">
         and a.org_id = #{obj.orgId,jdbcType=INTEGER}
       </if>
+      <if test="obj.approvalStatus != null">
+        and a.approval_status = #{obj.approvalStatus,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.yjzt != null">
+        and a.yjzt = #{obj.yjzt,jdbcType=VARCHAR}
+      </if>
     </where>
     order by a.bjsj desc
   </select>

src/main/java/com/chinaitop/depot/yjbj/model/Sbyj.java

@@ -63,5 +63,12 @@ public class Sbyj {
 
     private String pzbm;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date hfzcsj;
+
     private String houseCode;
+
+    private String clordbzt;//处理/督办状态
+
+    private String yjzt;//预警状态
 }

src/main/java/com/chinaitop/depot/yjbj/service/SbyjService.java

@@ -11,10 +11,12 @@ public interface SbyjService {
 	 * @param cfbm 仓房国标编码
 	 * @param orgId 库ID
 	 * @param alarmType 预警类型 1-测温设备故障 2-测温数据上传故障
+	 * @param approvalStatus 督办状态
+	 * @param yjzt 预警状态
 	 * @return
 	 * @throws Exception
 	 */
-	List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType) throws Exception;
+	List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType, String approvalStatus, String yjzt) throws Exception;
 
 	/**
 	 * 按主键ID查询一条数据

src/main/java/com/chinaitop/depot/yjbj/service/impl/SbyjServiceImpl.java

@@ -18,7 +18,7 @@ public class SbyjServiceImpl implements SbyjService {
 	private SbyjMapper sbyjMapper;
 
 	@Override
-	public List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType)
+	public List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType, String approvalStatus, String yjzt)
 			throws Exception {
 		Sbyj obj = new Sbyj();
 		obj.setDataFlag("1");//数据类型：1-库区 0-市级
@@ -27,6 +27,15 @@ public class SbyjServiceImpl implements SbyjService {
 		if (StringUtils.isNotBlank(cfbm)) {
 			obj.setCfbm(cfbm);
 		}
+		if (StringUtils.isNotBlank(cfbm)) {
+			obj.setCfbm(cfbm);
+		}
+		if (StringUtils.isNotBlank(approvalStatus)) {
+			obj.setApprovalStatus(approvalStatus.trim());
+		}
+		if (StringUtils.isNotBlank(yjzt)) {
+			obj.setYjzt(yjzt.trim());
+		}
 		return sbyjMapper.selectByExample(obj);
 	}