增加app接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -19,6 +19,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -147,7 +148,6 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getOrgCode(reginParams);
 
         HashMap<String, Object> paramMap = new HashMap<>();
         paramMap.put("bizOrgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
@@ -460,6 +460,34 @@ public class CheckController extends AbstractBaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
+    @PostMapping(value = "/checkCalendarNew", produces = "application/json;charset=UTF-8")
+    public CommonResponse checkCalendarNew(
+            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
+        try {
+            ReginParams reginParams = getSelectedOrgInfo();
+           // String loginOrgCode = getOrgCode(reginParams);
+
+            String loginOrgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
+//            String roleTypeName = getRoleTypeName(reginParams);
+            List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, false, null, null);
+
+            DaoCriteria childCompDaoCriteria = new DaoCriteria();
+            childCompDaoCriteria.setPropertyName("bizOrgCode");
+            childCompDaoCriteria.setOperator(QueryOperatorEnum.LIKE.getName());
+            childCompDaoCriteria.setValue(loginOrgCode);
+            daoCriterias.add(childCompDaoCriteria);
+
+
+            Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
+            return CommonResponseUtil.success(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+
+    }
 
 
 //    @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

@@ -112,6 +112,30 @@ public class RouteController extends AbstractBaseController {
 	}
 
 
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>")
+	@GetMapping(value = "/routeListNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse queryRouteListNew() {
+		try {
+
+			ReginParams reginParams = getSelectedOrgInfo();
+
+
+			List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCodeNew(reginParams.getPersonIdentity().getBizOrgCode(),null);
+			routeList=routeList.stream().distinct().collect(Collectors.toList());
+			return CommonResponseUtil.success(routeList);
+		} catch (Exception e) {
+			return CommonResponseUtil.failure(e.getMessage());
+		}
+	}
+
+
+
+
+
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线")
 	@GetMapping(value = "/AllNew", produces = "application/json;charset=UTF-8")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RouteMapper.java

@@ -71,6 +71,8 @@ public interface RouteMapper extends BaseMapper {
 	 */
 	List<HashMap<String, Object>> queryRouteListByOrgCode(@Param("orgCode") String orgCode,@Param("userId") String userId,@Param("deptId") String deptId);
 
+	List<HashMap<String, Object>> queryRouteListByOrgCodeNew(@Param("orgCode") String orgCode,@Param("userId") String userId);
+
 	/**
 	 * 获取路线巡检点个数
 	 * @param param

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -645,7 +645,10 @@ public class RouteServiceImpl implements IRouteService {
     public List<HashMap<String, Object>> queryRouteListByOrgCode(String orgCode, String userId, String deptId) {
         return routeMapper.queryRouteListByOrgCode(orgCode, userId, deptId);
     }
-
+    @Override
+    public List<HashMap<String, Object>> queryRouteListByOrgCodeNew(String orgCode, String userId) {
+        return routeMapper.queryRouteListByOrgCodeNew(orgCode, userId);
+    }
     @Override
     public void exchangeRoutePointOrderNumber(long src, long target) {
         List<Long> ids = new ArrayList<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IRouteService.java

@@ -170,7 +170,7 @@ public interface IRouteService {
 	 * @return
 	 */
 	List<HashMap<String, Object>> queryRouteListByOrgCode(String orgCode,String userId,String deptId);
-
+	List<HashMap<String, Object>> queryRouteListByOrgCodeNew(String orgCode,String userId);
 	/**
 	 * 根据路线查询巡检点
 	 * @param routeId

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CheckPageParamUtil.java

@@ -82,7 +82,10 @@ public class CheckPageParamUtil {
 		if(param.getEndDate() != null &&param.getEndDate().length()==10){
 			param.setEndDate(param.getEndDate()+" 23:59:59");
 		}
-		param.setOrgCode(perMap.get("orgCode") == null ? null : perMap.get("orgCode").toString());
+//		param.setOrgCode(perMap.get("orgCode") == null ? null : perMap.get("orgCode").toString());
+
+		param.setBizOrgCode(perMap.get("bizOrgCode") == null ? null : perMap.get("bizOrgCode").toString());
+
 		if ("0".equals(perMap.get("roleFlag"))) {
 			param.setUserId(perMap.get("userId") == null ? null : perMap.get("userId").toString());
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CheckParamUtil.java

@@ -23,6 +23,8 @@ public class CheckParamUtil {
 				param.setRouteId(Long.valueOf(daoCriterias.get(i).getValue().toString()));
 			}else if("orgCode".equals(name) && operator.equals(QueryOperatorEnum.EQUAL.getName())){
 				param.setOrgCode(daoCriterias.get(i).getValue().toString()+"%");
+			}else if("bizOrgCode".equals(name)){
+				param.setOrgCode(daoCriterias.get(i).getValue().toString());
 			}
 		}		
 		return param;

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -442,7 +442,8 @@
         DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
         <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
         <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+<!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
+        <if test="orgCode!=null">AND org_code LIKE concat(#{orgCode},"%")</if>
     </select>
 
     <select id="calendarData" resultType="Map">
@@ -456,7 +457,8 @@
         DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
         <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
         <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+<!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
+        <if test="orgCode!=null">AND org_code  LIKE concat(#{orgCode},"%") </if>
         GROUP BY is_ok,time
         ORDER BY time
     </select>

amos-boot-system-patrol/src/main/resources/db/mapper/routeMapper.xml

@@ -167,7 +167,47 @@
 		</if>) temp
 		GROUP BY temp.id
 	</select>
-	
+
+
+
+
+	<select id="queryRouteListByOrgCodeNew" resultType="Map">
+		SELECT temp.* FROM (
+		<if test="userId != null and userId != ''">
+			SELECT
+
+			r.id,
+			r.`name`
+			FROM
+			p_plan ppl
+			LEFT JOIN p_route r ON r.id = ppl.route_id
+			WHERE
+			r.is_delete = 0
+			AND	find_in_set(#{userId}, ppl.user_id) > 0 and r.biz_org_code LIKE CONCAT( #{orgCode}, '%')
+
+		</if>
+		<if test="(orgCode != null and orgCode != '')">
+			<if test="userId != null and userId != ''">
+				UNION
+			</if>
+			SELECT
+			r.id,
+			r.`name`
+			FROM
+			p_route r
+			WHERE
+			r.is_delete = 0
+			<if test="orgCode != null and orgCode != ''">
+				AND r.biz_org_code LIKE CONCAT( #{orgCode}, '%')
+			</if>
+
+		</if>) temp
+		GROUP BY temp.id
+	</select>
+
+
+
+
 	<select id="queryRoutePointsCount" resultType="Long">
 		SELECT
 			count(1) num