Merge branch 'develop_dl_3.7.0.7' of http://39.98.45.134:8090/moa/amos-boot-biz…

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/request/ToJson.java

+package com.yeejoin.amos.patrol.core.common.request;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/4/13
+ */
+public class ToJson {
+
+
+    public  static Object tojson(Object obj) {
+        Object ob=null;
+        if(obj!=null){
+            SerializeConfig serializeConfig = new SerializeConfig();
+            serializeConfig.put(Long.class, ToStringSerializer.instance);
+            serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
+            String json = JSONObject
+                    .toJSONString(obj, serializeConfig,
+                            SerializerFeature.PrettyFormat);
+            ob=JSONObject.parse(json);
+        }
+        return  ob;
+    }
+}

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.common.enums.DictTypeEnum;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
+import com.yeejoin.amos.patrol.core.common.request.ToJson;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.patrol.core.util.StringUtil;
 import com.yeejoin.amos.patrol.dao.entity.InputItem;
@@ -538,7 +539,10 @@ public class InputItemController extends AbstractBaseController {
 		String companyBizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
 
 		List<PointInputItemVo> list = inputItemService.queryCustomInputItemNew(params,orgCode,companyBizOrgCode);
-		return CommonResponseUtil.success(list);
+        Object ov=ToJson.tojson(list);
+
+
+		return CommonResponseUtil.success(ov);
 	}
 	/**
 	 * 条件查询检查项

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

@@ -225,15 +225,14 @@ public class PlanTaskController extends AbstractBaseController {
     @ApiOperation(value = "执行计划导出", notes = "执行计划导出")
     @GetMapping (value = "/reportPlanTaskNew", produces = "application/vnd.ms-excel;charset=UTF-8")
     public void planTaskReportNew(
-            @ApiParam(value = "导出参数", required = false) @RequestBody(required = false)PlanTaskPageParam params,
+            @ApiParam(value = "导出参数", required = false) PlanTaskPageParam params,
 
             HttpServletResponse response) {
         try {
-            PlanTaskPageParam paramsk =new PlanTaskPageParam();
             ReginParams reginParams = getSelectedOrgInfo();
-            paramsk.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+            params.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
 
-            List<PlanTaskVo> list = planTaskService.planTaskReportNew(paramsk);
+            List<PlanTaskVo> list = planTaskService.planTaskReportNew(params);
             String fileName = "计划执行" + new Date().getTime();
             FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response);
         } catch (Exception e) {

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
+import com.yeejoin.amos.patrol.core.common.request.ToJson;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
@@ -117,10 +118,9 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse queryEquipPointInputItemNew(@ApiParam(value = "巡检点id", required = true) @RequestParam Long pointId) {
 		try {
 			List<Map<String, Object>> pointInputItemList = iPointService.queryEquipPointInputItem(pointId);
-
 			Page<Map<String, Object>> pag =new PageImpl<Map<String, Object>>(pointInputItemList);
-
-			return CommonResponseUtil.success(pag);
+            Object ov= ToJson.tojson(pag);
+			return CommonResponseUtil.success(ov);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检点的巡检项失败");

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

@@ -179,48 +179,19 @@
 		ORDER BY create_date DESC
 	</select>
 	<select id="queryCustomInputItemByPointId" resultType="com.yeejoin.amos.patrol.business.vo.PointInputItemVo">
--- 		SELECT
--- 		pii.id,
--- 		pii.org_code,
--- 		pii.name,
--- 		ppi.order_no as  order_no,
--- 		pii.item_type ,
--- 		pii.is_must,
--- 		pii.input_json,
--- 		pii.catalog_id,
--- 		pii.is_delete,
--- 		pii.item_no,
--- 		pii.risk_desc,
--- 		pii.input_classify,
--- 		pii.picture_json,
--- 		pii.check_method,
--- 		pii.title,
--- 		pii.equipment_name,
--- 		pii.input_type,
--- 		pii.basis_json,
--- 		pii.level
--- 		FROM
--- 		p_point_classify ppc
--- 		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id
--- 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
---
--- 		WHERE pii.is_delete = '0'
+
 		SELECT
 		pii.*,
 		ppi.order_no as pOrderNo,
 		ppi.id as pointItemId,
 		ppc.name as classifyNames,
 		ppc.id as classifyIds
-<!--		,prpi.id  as routePointItemId-->
 		FROM
 		p_point_classify ppc
 		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id and ppc.point_id=ppi.point_id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
-<!--		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id-->
 		WHERE pii.is_delete = '0'
-		<if test="classifyId!=null and classifyId !='' "> AND ppc.id = #{classifyId}</if>
-<!--		<if test="pointId!=null and pointId !='' "> AND ppc.point_id = #{pointId}</if>-->
-<!--		<if test="equipmentId!=null and equipmentId !='' "> AND ppc.equipment_id = #{equipmentId}</if>-->
+		<if test="classifyId!=null and classifyId !='' "> AND ppi.classify_ids = #{classifyId}</if>
 	</select>
 	<select id="getInputItemListByitemNos" resultType="com.yeejoin.amos.patrol.business.vo.InputItemVo">
 		SELECT

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

@@ -22,15 +22,15 @@
 <!--	          OR-->
 <!--	       	(<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
 <!--	        )-->
-			<if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
+			<if test="beginDate!=null and endDate!=null and endDate != '' and beginDate != ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate==null and endDate != null and endDate != ''">
+			<if test="beginDate=='' and endDate != null and endDate != ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate!=null and beginDate != '' and endDate == null">
+			<if test="beginDate!=null and beginDate != '' and endDate == ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
 
 			</if>
@@ -104,15 +104,15 @@
 <!--	       	(<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
 <!--	        )-->
 
-			<if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
+			<if test="beginDate!=null and endDate!=null and endDate != '' and beginDate != ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate==null and endDate != null and endDate != ''">
+			<if test="beginDate=='' and endDate != null and endDate != ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate!=null and beginDate != '' and endDate == null">
+			<if test="beginDate!=null and beginDate != '' and endDate == ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
 
 			</if>