Merge remote-tracking branch 'origin/master'

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);
 

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) {

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}

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}

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}

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));
-	}
 }

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">

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();

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 取出来
 	 */
@@ -552,6 +546,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);
 		}
 
 		// 拼接采集点到设备巡检内容

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);