item：监督检查业务接口新增及调整

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/RoutePointItemController.java

 package com.yeejoin.amos.supervision.business.controller;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.business.util.InputItemParamUtil;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
+import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 import io.swagger.annotations.Api;
@@ -13,10 +19,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -44,11 +52,12 @@ public class RoutePointItemController extends AbstractBaseController {
     @ApiOperation(value = "新增巡检路线点项关系", notes = "新增巡检路线点项关系")
     @PostMapping(value = "/addRoutePointItem", produces = "application/json;charset=UTF-8")
     public CommonResponse addRoute(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan plan,
-                                   @ApiParam(value = "检查项IDS", required = true) @RequestParam List<Long> inputItemIds) {
+                                   @ApiParam(value = "检查项IDS", required = true) @RequestParam List<Long> inputItemIds,
+                                   @ApiParam(value = "是否保存并提交", required = true) @RequestParam Boolean status) {
         try {
             String userId = getUserId();
             if (StringUtils.isNotBlank(userId)) {
-                List<RoutePointItem> list = routePointItemService.addRoutePointItemList(plan, inputItemIds, userId);
+                List<RoutePointItem> list = routePointItemService.addRoutePointItemList(plan, inputItemIds, status, userId);
                 if (CollectionUtils.isNotEmpty(list)) {
                     return CommonResponseUtil.success();
                 }
@@ -60,4 +69,26 @@ public class RoutePointItemController extends AbstractBaseController {
             return CommonResponseUtil.failure("巡检路线点项关系新增失败！");
         }
     }
+
+    /**
+     * 分页查询检查项
+     *
+     * @param queryRequests
+     * @param pageable
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "分页查询检查项", notes = "分页查询检查项")
+    @RequestMapping(value = "/queryPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    public CommonResponse queryPage(
+            @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
+            @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String loginOrgCode = getOrgCode(reginParams);
+        HashMap<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgCode", loginOrgCode);
+        InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
+        Page<RoutePointItemVo> page = routePointItemService.queryPage(criterias);
+        return CommonResponseUtil.success(page);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/RoutePointItemMapper.java

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
 
+import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 
+import java.util.List;
+
 public interface RoutePointItemMapper extends BaseMapper{
 
     public void updateRoutePointItem( RoutePointItem pointItem);
 
     int delRoutePointItemByRouteId(Long routeId);
+
+    long queryPageCount(InputItemPageParam param);
+
+    List<RoutePointItemVo> queryPage(InputItemPageParam param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanDao.java

@@ -30,6 +30,11 @@ public interface IPlanDao extends BaseDao<Plan, Long> {
     @Query(value = "UPDATE p_plan SET is_delete = 1,`status` = 1 WHERE id IN (?1)", nativeQuery = true)
     void updatePlanDel(List<Long> ids);
 
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE p_plan SET `status` = (?1) WHERE id IN (?2)", nativeQuery = true)
+    void updatePlanStatus(Integer status, Long planId);
+
     Plan findByOriginalId(String originalId);
 
     @Query(value = "select * from p_plan where original_id in (?1) and is_delete = 0", nativeQuery = true)

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RoutePointItemServiceImpl.java

@@ -3,16 +3,23 @@ package com.yeejoin.amos.supervision.business.service.impl;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.supervision.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.supervision.business.dao.mapper.RoutePointItemMapper;
+import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
+import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemService;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
+import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -28,16 +35,23 @@ public class RoutePointItemServiceImpl implements IRoutePointItemService {
     private IRoutePointDao routePointDao;
 
     @Autowired
+    private IPlanDao planDao;
+
+    @Autowired
     private InputItemMapper inputItemMapper;
 
     @Autowired
     private RoutePointItemMapper routePointItemMapper;
 
     @Override
-    public List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, String userId) {
+    @Transactional
+    public List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, Boolean status, String userId) {
         Long planId = plan.getId();
         Long routeId = plan.getRouteId();
         if (CollectionUtils.isNotEmpty(inputItemIds) && routeId != null && planId != null) {
+            if (status) {
+                planDao.updatePlanStatus(PlanStatusEnum.EXAMINE_DEVELOPED.getValue(), planId);
+            }
             routePointItemDao.deleteByPlanId(planId);
             List<InputItem> inputItemList = inputItemMapper.findByIdIn(inputItemIds);
             List<RoutePoint> routePointList = routePointDao.findByRouteId(routeId);
@@ -63,11 +77,11 @@ public class RoutePointItemServiceImpl implements IRoutePointItemService {
         return Lists.newArrayList();
     }
 
-//    @Override
-//    public Page<RoutePointItemVo> queryPage(InputItemPageParam param) {
-//        long total = routePointItemMapper.queryPageCount(param);
-//        List<RoutePointItemVo> content = routePointItemMapper.queryPage(param);
-//        Page<RoutePointItemVo> result = new PageImpl<RoutePointItemVo>(content, param, total);
-//        return result;
-//    }
+    @Override
+    public Page<RoutePointItemVo> queryPage(InputItemPageParam param) {
+        long total = routePointItemMapper.queryPageCount(param);
+        List<RoutePointItemVo> content = routePointItemMapper.queryPage(param);
+        Page<RoutePointItemVo> result = new PageImpl<RoutePointItemVo>(content, param, total);
+        return result;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IRoutePointItemService.java

 package com.yeejoin.amos.supervision.business.service.intfc;
 
+import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
 public interface IRoutePointItemService {
 
-    List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, String userId);
+    List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, Boolean status, String userId);
+
+    Page<RoutePointItemVo> queryPage(InputItemPageParam criterias);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/RoutePointItemVo.java

+package com.yeejoin.amos.supervision.business.vo;
+
+import java.util.Date;
+
+public class RoutePointItemVo {
+
+    /**
+     * 检查项ID
+     */
+    private Long inputItemId;
+
+    /**
+     * 检查项名称
+     */
+    private String inputItemName;
+
+    /**
+     * 安全隐患个数
+     */
+    private Integer safetyDangerNum;
+
+    /**
+     * 重大隐患个数
+     */
+    private Integer majorDangerNum;
+
+    /**
+     * 检查时间
+     */
+    private Date checkTime;
+
+    /**
+     * 检查人
+     */
+    private String userName;
+
+    /**
+     * 责任单位
+     */
+    private String companyName;
+
+    /**
+     * 扩展属性
+     */
+    private String ext;
+}

amos-boot-system-supervision/src/main/resources/db/mapper/routePointItemMapper.xml

@@ -43,4 +43,65 @@
               route_id = #{routeId}
           )
     </delete>
+    <!--统计 -->
+    <select id="queryPageCount" resultType="long">
+        SELECT
+        count(1) AS total_num
+        FROM
+        p_input_item a
+        where a.is_delete = '0' and a.input_type != '1'
+        <if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
+        <if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
+        <if test="inputClassify != null"> and a.input_classify = #{inputClassify}</if>
+        <if test="itemType!=null"> and a.item_Type = #{itemType} </if>
+        <if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
+        order by a.id desc
+    </select>
+    <!--查询 -->
+    <select id="queryPage" resultMap="com.yeejoin.amos.supervision.business.vo.RoutePointItemVo">
+        SELECT
+        a.id,
+        a.NAME,
+        a.item_no,
+        a.item_type,
+        a.is_must,
+        a.default_value,
+        a.is_score,
+        b.NAME AS catalog_name,
+        a.remark,
+        a.LEVEL,
+        a.risk_desc,
+        a.maintenance_content,
+        a.test_requirement,
+        a.check_method,
+        a.create_date,
+        a.input_classify,
+        a.check_type,
+        a.item_parent,
+        a.item_classify,
+        a.item_type_classify,
+        a.item_level,
+        a.item_start,
+        IF
+        ( i.input_item_id IS NULL, 0, 1 ) AS ext
+        FROM
+        p_input_item a
+        LEFT JOIN p_catalog_tree b ON a.catalog_id = b.id
+        LEFT JOIN p_route_point_item i ON a.id = i.input_item_id
+        WHERE
+        a.is_delete = '0'
+        AND a.input_type != '1'
+        <if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
+        <if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
+        <if test="itemType!=null"> and a.item_Type = #{itemType} </if>
+        <if test="checkTypeId!=null"> and a.check_type_Val = #{checkTypeId} </if>
+        <if test="itemStart!=null"> and a.item_start = #{itemStart} </if>
+        <!-- <if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>-->
+        <if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
+        order by a.id desc
+        <choose>
+            <when test="pageSize==-1"></when>
+            <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
+        </choose>
+    </select>
 </mapper>
\ No newline at end of file