From 088a573ab2602a702db4252bd108576517006dd4 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Mon, 7 Aug 2023 09:14:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B0=B4=E7=94=B5=E7=AB=99=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
index 67ec81b..cd09018 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
@@ -204,7 +204,7 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService {
     @Override
     public R exportHydropowerStationMonthReport(HttpServletResponse response, HashMap<String, Object> map, Integer year, Integer month, Long deptId) {
         R<List<Dept>> deptByCurrentUser = sysClient.getDeptByCurrentUser();
-        if (!deptByCurrentUser.isSuccess()||deptByCurrentUser.getData()!=null){
+        if (!deptByCurrentUser.isSuccess()||deptByCurrentUser.getData()==null){
             return R.fail("用户权限查询失败");
         }
         R<String> deptNameR = sysClient.getDeptName(deptId);

From 223eb21b48a7130d67ff743537d0e2ae65f760a9 Mon Sep 17 00:00:00 2001
From: tanghaihao <850814414@qq.com>
Date: Mon, 7 Aug 2023 10:49:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=BA=E7=BB=84=E6=9C=80=E5=A4=A7=E5=80=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml      | 2 +-
 .../java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
index db7e24d..d7be978 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
@@ -117,7 +117,7 @@
 	</select>
 
     <select id="getMaxEmIndexByPid" resultType="java.lang.Integer">
-        select max(em_index) from hzims_em_info where DEPARTMENT = #{department} and em_grade = #{emGrade}
+        select max(em_index) from hzims_em_info where DEPARTMENT = #{department} and em_grade = #{emGrade} and is_deleted = 0
     </select>
 
     <select id="getSparePart" resultType="com.hnac.hzims.equipment.vo.SparePartVO">
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
index e2477b1..0624b01 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
@@ -552,6 +552,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 		if (deviceResult.getCode() == 200 && Func.isNotEmpty(deviceResult.getData())) {
 			List<DeviceChildrenVO> deviceChildrenList = deviceResult.getData();
 			childrenMap = deviceChildrenList.stream().collect(Collectors.toMap(DeviceChildrenVO::getSignage, Function.identity()));
+			log.warn("设备信息查询巡检内容关联采集点信息：" + childrenMap);
 		}
 
 		// 拼接采集点到设备巡检内容

From ba1180661b21be6943a20d6943f536adc050ff8a Mon Sep 17 00:00:00 2001
From: tanghaihao <850814414@qq.com>
Date: Mon, 7 Aug 2023 11:05:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=B2=A1=E7=94=A8=E5=88=B0=E7=9A=84getEmInfoTreeByEmCode?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/equipment/feign/IEmInfoClient.java     |  4 ----
 .../java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java |  4 ----
 .../main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java | 10 ----------
 .../java/com/hnac/hzims/equipment/service/IEmInfoService.java  |  2 --
 .../hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java   |  6 ------
 5 files changed, 26 deletions(-)

diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java
index 4d5d095..7c99354 100644
--- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java
+++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java
@@ -76,7 +76,6 @@ public interface IEmInfoClient {
 	String GET_EM_INFO_BY_DEPT = API_PREFIX + "/getEmInfoByDept";
 	String GET_EM_INFO_BY_NAME = API_PREFIX + "/getEmInfoByName";
 	String GET_EM_INFO_BY_EM_CODE = API_PREFIX + "/getEmInfoByEmCode";
-	String GET_EM_INFO_TREE_BY_EM_CODE = API_PREFIX + "/getEmInfoTreeByEmCode";
 	String UPDATE_BY_EM_CODE = API_PREFIX + "/updateByEmCode";
 	String UPDATE_BATCH_EM_STATE = API_PREFIX + "/updateBachEmState";
 	String GET_CHILDREN_BY_EM_CODE = API_PREFIX + "/getChildrenByEmCode";
@@ -115,9 +114,6 @@ public interface IEmInfoClient {
 	@GetMapping(GET_EM_INFO_BY_EM_CODES)
 	R<List<EmInfoEntity>> getEmInfoByEmCodes(@RequestParam("emCodes") List<String> emCodes);
 
-	@GetMapping(GET_EM_INFO_TREE_BY_EM_CODE)
-	R<List<EmInfoEntity>> getEmInfoTreeByEmCode(@RequestParam("emCode") String emCode);
-
 	@PostMapping(GET_EM_INFO_UNIT_COUNT_BY_DEPT)
 	R<Integer> getEmInfoUnitCountByDept(@RequestParam("list") List<Long> list);
 
diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java
index e8b0b95..b9aa407 100644
--- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java
+++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java
@@ -54,10 +54,6 @@ public class IEmInfoClientBack implements IEmInfoClient {
 		return R.data(new ArrayList<>());
 	}
 
-	@Override
-	public R<List<EmInfoEntity>> getEmInfoTreeByEmCode(String emCode) {
-		return R.data(new ArrayList<>());
-	}
 
 	@Override
 	public R<Integer> getEmInfoUnitCountByDept(List<Long> depts) {
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
index dd24111..cb2ac6e 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
@@ -144,14 +144,4 @@ public class EmInfoClient implements IEmInfoClient {
 		return R.data(service.list(wrapper).stream().map(EmInfoEntity::getNumber).distinct().collect(Collectors.toList()));
 	}
 
-	/**
-	 *
-	 * @param emCode
-	 * @return
-	 */
-	@GetMapping(value = GET_EM_INFO_TREE_BY_EM_CODE)
-	@Override
-	public R<List<EmInfoEntity>> getEmInfoTreeByEmCode(String emCode) {
-		return R.data(service.getEmInfoTreeByEmCode(emCode));
-	}
 }
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java
index fe9aa95..b607902 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java
@@ -60,8 +60,6 @@ public interface IEmInfoService extends BaseService<EmInfoEntity> {
 
 	EmInfoEntity getEmInfoByEmCode(String emCode);
 
-	List<EmInfoEntity> getEmInfoTreeByEmCode(String emCode);
-
 	void loadEmInfo();
 
 	List<EminfoAndEmParamVo> getEmInfoAndParamRedis();
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
index 0624b01..25cd987 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
@@ -311,12 +311,6 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 		return this.baseMapper.selectEmInfoByEmCode(emCode);
 	}
 
-	@Override
-	public List<EmInfoEntity> getEmInfoTreeByEmCode(String emCode) {
-
-		return null;
-	}
-
 	/**
 	 * 把设备信息及装机容量、ct、pt从Redis 取出来
 	 */

From ecb961a2dccd92b4bdd0a4bb80c1826284461ff0 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Mon, 7 Aug 2023 11:18:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml    | 2 +-
 .../src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml   | 2 +-
 .../src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml
index 51f8465..af3d899 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml
+++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml
@@ -46,7 +46,7 @@
         wt_sp_allocation wa
         JOIN wt_sp_warehouse sw ON wa.OUT_WAREHOUSE_ID = sw.id
         <if test="params.code!=null and params.code!=''">
-            and wa.code = #{params.code}
+            and wa.code  like  concat('%',#{params.code},'%')
         </if>
         <if test="params.status!=null">
             and wa.status = #{params.status}
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml
index 7d7f1bc..80ee565 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml
+++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml
@@ -47,7 +47,7 @@
             wt_sp_warehouse_in wi
             JOIN wt_sp_warehouse sw ON wi.STORAGE_ROOM = sw.id
         <if test="params.code!=null and params.code!=''">
-            and wi.code = #{params.code}
+            and wi.code like  concat('%',#{params.code},'%')
         </if>
         <if test="params.type!=null">
             and wi.type = #{params.type}
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml
index 54863cd..d3349a8 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml
+++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml
@@ -47,7 +47,7 @@
         wt_sp_warehouse_out wo
         JOIN wt_sp_warehouse sw ON wo.STORAGE_ROOM = sw.id
         <if test="params.code!=null and params.code!=''">
-            and wo.code = #{params.code}
+            and wo.code like  concat('%',#{params.code},'%')
         </if>
         <if test="params.type!=null">
             and wo.type = #{params.type}