内蒙山洪灾害运维系统版本提交-中心职工权限控制功能

src/main/java/org/springblade/modules/business/check/order/controller/RtuCheckOrderController.java

@@ -94,7 +94,7 @@ public class RtuCheckOrderController extends BladeController {
 	private final IDeptRegionService deptRegionService;
 	private final ICheckOrderSettingService checkOrderSettingService;
 	private final IBaseInfoRegionService regionService;
-
+	private final IBaseInfoDictService dictService;
 	/**
 	 * 工单查询，分页
 	 */
@@ -765,6 +765,12 @@ public class RtuCheckOrderController extends BladeController {
 		data.put("orderCount", orderCount);
 		data.put("orderUnconfirm", unConfirmOrderCount);
 		data.put("orderProcessing", unCloseOrderCount);
+
+		DictInfoEntity dictInfoEntity = dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_PROCESS.getCode());
+		checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+		Long reports= rtuCheckOrderService.reportCount(checkOrderInfoDTO);
+		data.put("reportOrder", reports);
+
 		checkOrderInfoDTO.setOrderConfirm(1);
 		checkOrderInfoDTO.setOrderClose(1);
 		Long reportOrderCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderInfoEntity.java

@@ -108,4 +108,11 @@ public class CheckOrderInfoEntity extends BaseEntity {
 	@ApiModelProperty(value = "负责人")
 	private Long contactUser;
 
+	/**
+	 * 任务填报人
+	 */
+	@ApiModelProperty(value = "任务填报人")
+	private Long processUser;
+
+
 }

src/main/java/org/springblade/modules/business/check/order/mapper/RtuCheckOrderMapper.java

@@ -104,6 +104,9 @@ public interface RtuCheckOrderMapper extends BaseMapper<CheckOrderInfoEntity> {
 	 */
 	Long unCloseOrderCount(@Param("checkOrderInfoDTO") CheckOrderInfoDTO checkOrderInfoDTO);
 
+	Long reportCount(@Param("checkOrderInfoDTO") CheckOrderInfoDTO checkOrderInfoDTO);
+
+
 	/**
 	 * 查询维修任务历史信息
 	 * @param page

src/main/java/org/springblade/modules/business/check/order/mapper/RtuCheckOrderMapper.xml

@@ -16,6 +16,8 @@
         <result column="order_confirm_time" property="orderConfirmTime"/>
         <result column="contact_user" property="contactUser"/>
         <result column="contact_phone" property="contactPhone"/>
+        <result column="process_user" property="processUser"/>
+
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -33,7 +35,6 @@
         <result column="lat" property="lat"/>
         <result column="location_desc" property="locationDesc"/>
         <result column="rtu_name" property="rtuName"/>
-        <result column="real_name" property="processorName"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
         <result column="contact_user" property="contactUser"/>
@@ -46,6 +47,11 @@
         <result column="is_res" property="isRes"/>
         <result column="is_ground" property="isGround"/>
         <result column="is_video" property="isVideo"/>
+        <result column="process_user" property="processUser"/>
+        <result column="processor_name" property="processorName"/>
+        <result column="process_user_name" property="processUserName"/>
+
+
     </resultMap>
 
     <resultMap id="checkOrderCountVOResultMap" type="org.springblade.modules.business.check.order.vo.CheckOrderCountVO">
@@ -74,14 +80,15 @@
 
     <select id="allOrders" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,u.phone AS contact_phone,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
-        AS contact_user_name
+        o.*,u.real_name AS processor_name,u.phone AS contact_phone,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
+        AS contact_user_name,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
         LEFT JOIN blade_user u2 ON u2.id = o.contact_user and u2.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         <if test="checkOrderInfoDTO.rtuCode!=null">
@@ -111,14 +118,16 @@
 
     <select id="selectPage" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,i.rtu_name,i.is_rain,i.is_river,i.is_res,i.is_ground,i.is_video,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
-        AS contact_user_name,a.adcd,a.ancestors
+        o.*,u.real_name AS processor_name,i.rtu_name,i.is_rain,i.is_river,i.is_res,i.is_ground,i.is_video,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
+        AS contact_user_name,a.adcd,a.ancestors,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
+        LEFT JOIN blade_dict_biz d ON d.id = o.order_status_key and d.is_deleted=0
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
         LEFT JOIN blade_user u2 ON u2.id = o.contact_user and u2.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         <if test="checkOrderInfoDTO.rtuCode!=null">
@@ -143,7 +152,7 @@
             and (a.adcd =#{checkOrderInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE
             is_deleted =0 and ancestors like concat(concat('%', #{checkOrderInfoDTO.adCode}), '%')))
         </if>
-        order by o.order_confirm ,o.order_close,o.create_time
+        order by d.dict_key desc , o.update_time desc
     </select>
 
     <select id="selectHistoryPage" resultMap="checkOrderHistroyVOResultMap">
@@ -204,8 +213,8 @@
 
     <select id="selectWarnPage" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,i.rtu_name,i.is_rain,i.is_river,i.is_res,i.is_ground,i.is_video,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
-        AS contact_user_name,a.adcd,a.ancestors
+        o.*,u.real_name AS processor_name,i.rtu_name,i.is_rain,i.is_river,i.is_res,i.is_ground,i.is_video,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name
+        AS contact_user_name,a.adcd,a.ancestors,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
@@ -213,6 +222,7 @@
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
         LEFT JOIN blade_user u2 ON u2.id = o.contact_user and u2.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         and w.warning_kind = #{checkOrderInfoDTO.warnKind}
@@ -243,14 +253,15 @@
 
     <select id="selectMyPage" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name AS
-        contact_user_name,a.adcd,a.ancestors
+        o.*,u.real_name AS processor_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name AS
+        contact_user_name,a.adcd,a.ancestors,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
         LEFT JOIN blade_user u2 ON u2.id = o.contact_user and u2.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         <if test="checkOrderInfoDTO.rtuCode!=null">
@@ -281,14 +292,15 @@
 
     <select id="selectConfirmDelayPage" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name AS
-        contact_user_name,a.adcd,a.ancestors
+        o.*,u.real_name AS processor_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u2.real_name AS
+        contact_user_name,a.adcd,a.ancestors,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
         LEFT JOIN blade_user u2 ON u2.id = o.contact_user and u2.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         and o.order_confirm = 0
@@ -359,12 +371,13 @@
 
     <select id="unconfirmOrderList" resultMap="checkOrderInfoVOResultMap">
         SELECT
-        o.*,u.real_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist
+        o.*,u.real_name AS processor_name,i.rtu_name,i.lng,i.lat,i.location_desc,i.ad_city,i.ad_dist,u3.real_name AS process_user_name
         FROM
         rtu_failure_check_order o
         LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         LEFT JOIN blade_user u ON u.id = o.update_user and u.is_deleted=0
+        LEFT JOIN blade_user u3 ON u3.id = o.process_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
         and o.order_confirm = 0
@@ -404,6 +417,29 @@
         </if>
     </select>
 
+    <select id="reportCount" resultType="java.lang.Long">
+        SELECT
+        count(*)
+        FROM
+        rtu_failure_check_order o
+        LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code and i.is_deleted=0
+        LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
+        WHERE
+        o.is_deleted = 0
+        and o.order_confirm = 1 and o.order_close=0
+
+        <if test="checkOrderInfoDTO.orderStatusKey!=null">
+            AND o.id in (select order_id from  rtu_failure_check_order_process where is_deleted=0 and order_status_key =#{checkOrderInfoDTO.orderStatusKey} group by order_id)
+        </if>
+        <if test="checkOrderInfoDTO.excludeCode!=null and checkOrderInfoDTO.excludeCode==1">
+            and a.exclude_ad = 0
+        </if>
+        <if test="checkOrderInfoDTO.adCode!=null">
+            and (a.adcd =#{checkOrderInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE
+            is_deleted =0 and ancestors like concat(concat('%', #{checkOrderInfoDTO.adCode}), '%')))
+        </if>
+    </select>
+
     <select id="orderReportCount" resultMap="checkOrderCountVOResultMap">
         SELECT u.real_name,u.id,o.order_count,o2.processing_order_count FROM blade_user u LEFT JOIN
         (SELECT order_confirm_user,count(id) as order_count FROM rtu_failure_check_order WHERE is_deleted=0 AND

src/main/java/org/springblade/modules/business/check/order/service/IRtuCheckOrderService.java

@@ -95,6 +95,7 @@ public interface IRtuCheckOrderService extends BaseService<CheckOrderInfoEntity>
 	 */
 	List<CheckOrderCountVO> orderReportCount( CheckOrderInfoDTO checkOrderInfoDTO);
 
+
 	/**
 	 * 任务总数
 	 * @param checkOrderInfoDTO
@@ -109,7 +110,7 @@ public interface IRtuCheckOrderService extends BaseService<CheckOrderInfoEntity>
 	 */
 	Long unCloseOrderCount(CheckOrderInfoDTO checkOrderInfoDTO);
 
-
+	Long reportCount(CheckOrderInfoDTO checkOrderInfoDTO);
 	/**
 	 * 关闭维修任务
 	 * @param checkOrderInfoDTO

src/main/java/org/springblade/modules/business/check/order/service/impl/RtuCheckOrderServiceImpl.java

@@ -144,6 +144,11 @@ public class RtuCheckOrderServiceImpl extends BaseServiceImpl<RtuCheckOrderMappe
 		return baseMapper.unCloseOrderCount(checkOrderInfoDTO);
 	}
 
+	@Override
+	public Long reportCount(CheckOrderInfoDTO checkOrderInfoDTO) {
+		return baseMapper.reportCount(checkOrderInfoDTO);
+	}
+
 	@Override
 	public boolean closeOrder(CheckOrderInfoDTO checkOrderInfoDTO) {
 		LambdaQueryWrapper<CheckOrderInfoEntity> wrapper = Wrappers.<CheckOrderInfoEntity>query().lambda();

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderCountVO.java

@@ -45,4 +45,7 @@ public class CheckOrderCountVO extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "处理中工单数量")
 	private Long processingOrderCount;
+
+
+
 }

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderInfoVO.java

@@ -240,4 +240,11 @@ public class CheckOrderInfoVO extends CheckOrderInfoEntity {
 	 */
 	@ApiModelProperty(value = "开卡单位")
 	private String networkPayer;
+
+
+	/**
+	 * 填报人名称
+	 */
+	@ApiModelProperty(value = "填报人名称")
+	private String processUserName;
 }

src/main/java/org/springblade/modules/business/check/process/controller/RtuOrderProcessController.java

@@ -214,7 +214,6 @@ public class RtuOrderProcessController extends BladeController {
 		return R.data(vo);
 	}
 
-
 	/**
 	 * 新增
 	 */
@@ -222,11 +221,13 @@ public class RtuOrderProcessController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入orderProcessInfoEntity")
 	public R save(@RequestBody OrderProcessInfoEntity orderProcessInfoEntity) {
+		BladeUser user = AuthUtil.getUser();
 		CheckOrderInfoEntity checkOrderInfoEntity = checkOrderService.getById(orderProcessInfoEntity.getOrderId());
 
 		DictInfoEntity dictInfoEntity = dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_PROCESS.getCode());
 		checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
 		checkOrderInfoEntity.setOrderDesc(orderProcessInfoEntity.getProcessDesc());
+		checkOrderInfoEntity.setProcessUser(user.getUserId());
 		checkOrderService.updateOrderStatus(checkOrderInfoEntity);
 
 		orderProcessInfoEntity.setOrderStatusKey(checkOrderInfoEntity.getOrderStatusKey());

src/main/java/org/springblade/modules/business/equipment/inspection/report/controller/EquipmentInspectionReportController.java

@@ -244,6 +244,11 @@ public class EquipmentInspectionReportController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入实体类EquipmentInspectionReportEntity ")
 	public R save(@RequestBody EquipmentInspectionReportEntity inspectionReportEntity) {
 		BladeUser user = AuthUtil.getUser();
+		if (inspectionReportEntity.getNetworkSignalStatus()==0){
+			if (null == inspectionReportEntity.getInspectionWorkPhotos() || inspectionReportEntity.getInspectionWorkPhotos().length()==0){
+				return R.fail("现场信号正常时，至少需要拍摄一张工作留存照片！");
+			}
+		}
 		Calendar dt = Calendar.getInstance();
 		dt.setTime(new Date());
 		Calendar calendarStart = Calendar.getInstance();