diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 223c875..bd57777 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -22,10 +22,12 @@ import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.board.NoticeBoardMapper; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.board.INoticeBoardService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.system.IRemindConfigService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -49,6 +51,7 @@ private final IRemindConfigService remindConfigService; private final NoticeBoardMapper noticeBoardMapper; + private final ISystemDeptService systemDeptService; private final List InCheckSampleStatus = Arrays.asList(CheckCompletionEnum.IN_CHECK,CheckCompletionEnum.UNCHECK,CheckCompletionEnum.CHECKED); @@ -136,15 +139,23 @@ } private List getScopeOrCurrentDeptIds(){ - if(ShiroKit.isAdmin()){ - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - return dataScope.getDeptIds(); - } - }else { - return getCurrentDeptIds(); +// if(ShiroKit.isAdmin()){ +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// return dataScope.getDeptIds(); +// } +// }else { +// return getCurrentDeptIds(); +// } +// return null; + + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); } - return null; + return userDeptIds; } @@ -396,7 +407,7 @@ if(key.split(";;;").length >= 4){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setDeptName(key.split(";;;")[3]); item.setCount(deptGroupMap.get(key).size()); @@ -414,7 +425,7 @@ if(key.split(";;;").length >= 3){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setCount(companyGroupMap.get(key).size()); companyGroupList.add(item); @@ -429,8 +440,17 @@ EquipmentQueryForm queryForm = new EquipmentQueryForm(); if(CollUtil.isEmpty(deptIds)){ deptIds = getScopeOrCurrentDeptIds(); + queryForm.setDeptIds(deptIds); + }else { + List subDeptIds = new ArrayList<>(); + List allDeptList = permissionContext.getDeptService().list(null); + for (Long deptId : deptIds) { + subDeptIds.add(deptId); + subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); + } + queryForm.setDeptIds(subDeptIds); } - queryForm.setDeptIds(deptIds); + queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); if(CollUtil.isEmpty(list)){ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 223c875..bd57777 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -22,10 +22,12 @@ import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.board.NoticeBoardMapper; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.board.INoticeBoardService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.system.IRemindConfigService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -49,6 +51,7 @@ private final IRemindConfigService remindConfigService; private final NoticeBoardMapper noticeBoardMapper; + private final ISystemDeptService systemDeptService; private final List InCheckSampleStatus = Arrays.asList(CheckCompletionEnum.IN_CHECK,CheckCompletionEnum.UNCHECK,CheckCompletionEnum.CHECKED); @@ -136,15 +139,23 @@ } private List getScopeOrCurrentDeptIds(){ - if(ShiroKit.isAdmin()){ - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - return dataScope.getDeptIds(); - } - }else { - return getCurrentDeptIds(); +// if(ShiroKit.isAdmin()){ +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// return dataScope.getDeptIds(); +// } +// }else { +// return getCurrentDeptIds(); +// } +// return null; + + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); } - return null; + return userDeptIds; } @@ -396,7 +407,7 @@ if(key.split(";;;").length >= 4){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setDeptName(key.split(";;;")[3]); item.setCount(deptGroupMap.get(key).size()); @@ -414,7 +425,7 @@ if(key.split(";;;").length >= 3){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setCount(companyGroupMap.get(key).size()); companyGroupList.add(item); @@ -429,8 +440,17 @@ EquipmentQueryForm queryForm = new EquipmentQueryForm(); if(CollUtil.isEmpty(deptIds)){ deptIds = getScopeOrCurrentDeptIds(); + queryForm.setDeptIds(deptIds); + }else { + List subDeptIds = new ArrayList<>(); + List allDeptList = permissionContext.getDeptService().list(null); + for (Long deptId : deptIds) { + subDeptIds.add(deptId); + subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); + } + queryForm.setDeptIds(subDeptIds); } - queryForm.setDeptIds(deptIds); + queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); if(CollUtil.isEmpty(list)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index f16c7b3..c978172 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -360,7 +360,8 @@ if(CollUtil.isEmpty(itemModels)){ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); }else if(itemModels.size() == 1){ - if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction())){ + if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction()) && + !importDTO.getHelpInstruction().equals(itemModels.get(0).getHelpInstruction())){ throw new BusinessException(1500, String.format(validMsg, i + 1, "辅助字段不存在")); } importDTO.setModelId(itemModels.get(0).getId()); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 223c875..bd57777 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -22,10 +22,12 @@ import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.board.NoticeBoardMapper; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.board.INoticeBoardService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.system.IRemindConfigService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -49,6 +51,7 @@ private final IRemindConfigService remindConfigService; private final NoticeBoardMapper noticeBoardMapper; + private final ISystemDeptService systemDeptService; private final List InCheckSampleStatus = Arrays.asList(CheckCompletionEnum.IN_CHECK,CheckCompletionEnum.UNCHECK,CheckCompletionEnum.CHECKED); @@ -136,15 +139,23 @@ } private List getScopeOrCurrentDeptIds(){ - if(ShiroKit.isAdmin()){ - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - return dataScope.getDeptIds(); - } - }else { - return getCurrentDeptIds(); +// if(ShiroKit.isAdmin()){ +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// return dataScope.getDeptIds(); +// } +// }else { +// return getCurrentDeptIds(); +// } +// return null; + + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); } - return null; + return userDeptIds; } @@ -396,7 +407,7 @@ if(key.split(";;;").length >= 4){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setDeptName(key.split(";;;")[3]); item.setCount(deptGroupMap.get(key).size()); @@ -414,7 +425,7 @@ if(key.split(";;;").length >= 3){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setCount(companyGroupMap.get(key).size()); companyGroupList.add(item); @@ -429,8 +440,17 @@ EquipmentQueryForm queryForm = new EquipmentQueryForm(); if(CollUtil.isEmpty(deptIds)){ deptIds = getScopeOrCurrentDeptIds(); + queryForm.setDeptIds(deptIds); + }else { + List subDeptIds = new ArrayList<>(); + List allDeptList = permissionContext.getDeptService().list(null); + for (Long deptId : deptIds) { + subDeptIds.add(deptId); + subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); + } + queryForm.setDeptIds(subDeptIds); } - queryForm.setDeptIds(deptIds); + queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); if(CollUtil.isEmpty(list)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index f16c7b3..c978172 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -360,7 +360,8 @@ if(CollUtil.isEmpty(itemModels)){ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); }else if(itemModels.size() == 1){ - if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction())){ + if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction()) && + !importDTO.getHelpInstruction().equals(itemModels.get(0).getHelpInstruction())){ throw new BusinessException(1500, String.format(validMsg, i + 1, "辅助字段不存在")); } importDTO.setModelId(itemModels.get(0).getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java index 6103000..9251df5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.equipment.EquipmentInfoApproval; @@ -26,6 +27,8 @@ import java.util.Date; import java.util.List; +import static com.casic.missiles.core.datascope.ScopeEnums.ALL_TYPE; + /** *

* 受检系统-系统管理-安装位置管理 服务实现类 @@ -113,8 +116,12 @@ } @NotNull - private static QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { + private QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { QueryWrapper queryWrapper = new QueryWrapper<>(); + DataScope dataScope = authService.getLoginUserDataScope(); + if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ + queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + } if(ObjectUtil.isNotEmpty(positionId)){ queryWrapper.eq("position_id",positionId); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 223c875..bd57777 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -22,10 +22,12 @@ import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.board.NoticeBoardMapper; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.board.INoticeBoardService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.system.IRemindConfigService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -49,6 +51,7 @@ private final IRemindConfigService remindConfigService; private final NoticeBoardMapper noticeBoardMapper; + private final ISystemDeptService systemDeptService; private final List InCheckSampleStatus = Arrays.asList(CheckCompletionEnum.IN_CHECK,CheckCompletionEnum.UNCHECK,CheckCompletionEnum.CHECKED); @@ -136,15 +139,23 @@ } private List getScopeOrCurrentDeptIds(){ - if(ShiroKit.isAdmin()){ - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - return dataScope.getDeptIds(); - } - }else { - return getCurrentDeptIds(); +// if(ShiroKit.isAdmin()){ +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// return dataScope.getDeptIds(); +// } +// }else { +// return getCurrentDeptIds(); +// } +// return null; + + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); } - return null; + return userDeptIds; } @@ -396,7 +407,7 @@ if(key.split(";;;").length >= 4){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setDeptName(key.split(";;;")[3]); item.setCount(deptGroupMap.get(key).size()); @@ -414,7 +425,7 @@ if(key.split(";;;").length >= 3){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setCount(companyGroupMap.get(key).size()); companyGroupList.add(item); @@ -429,8 +440,17 @@ EquipmentQueryForm queryForm = new EquipmentQueryForm(); if(CollUtil.isEmpty(deptIds)){ deptIds = getScopeOrCurrentDeptIds(); + queryForm.setDeptIds(deptIds); + }else { + List subDeptIds = new ArrayList<>(); + List allDeptList = permissionContext.getDeptService().list(null); + for (Long deptId : deptIds) { + subDeptIds.add(deptId); + subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); + } + queryForm.setDeptIds(subDeptIds); } - queryForm.setDeptIds(deptIds); + queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); if(CollUtil.isEmpty(list)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index f16c7b3..c978172 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -360,7 +360,8 @@ if(CollUtil.isEmpty(itemModels)){ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); }else if(itemModels.size() == 1){ - if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction())){ + if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction()) && + !importDTO.getHelpInstruction().equals(itemModels.get(0).getHelpInstruction())){ throw new BusinessException(1500, String.format(validMsg, i + 1, "辅助字段不存在")); } importDTO.setModelId(itemModels.get(0).getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java index 6103000..9251df5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.equipment.EquipmentInfoApproval; @@ -26,6 +27,8 @@ import java.util.Date; import java.util.List; +import static com.casic.missiles.core.datascope.ScopeEnums.ALL_TYPE; + /** *

* 受检系统-系统管理-安装位置管理 服务实现类 @@ -113,8 +116,12 @@ } @NotNull - private static QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { + private QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { QueryWrapper queryWrapper = new QueryWrapper<>(); + DataScope dataScope = authService.getLoginUserDataScope(); + if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ + queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + } if(ObjectUtil.isNotEmpty(positionId)){ queryWrapper.eq("position_id",positionId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java index 7bff524..3b2e9f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractUserService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.equipment.EquipmentInfoApproval; @@ -26,6 +27,8 @@ import java.util.Date; import java.util.List; +import static com.casic.missiles.core.datascope.ScopeEnums.ALL_TYPE; + /** *

* 受检系统-系统管理-岗位管理 服务实现类 @@ -112,8 +115,12 @@ } @NotNull - private static QueryWrapper getQueryWrapper(Long searchId, String positionName) { + private QueryWrapper getQueryWrapper(Long searchId, String positionName) { QueryWrapper queryWrapper = new QueryWrapper<>(); + DataScope dataScope = authService.getLoginUserDataScope(); + if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ + queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + } if(StrUtil.isNotEmpty(positionName)){ queryWrapper.like("position_name", positionName); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 43ce59e..b8464a8 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 7043947..0a2a139 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java index f8fdff4..4c16d34 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/board/BoardMessageMapper.java @@ -23,7 +23,8 @@ List noticeMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, - @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName); + @Param("userCompanyId") Long userCompanyId, @Param("userCompanyName") String userCompanyName, + @Param("topCompanyName")String topCompanyName); List remindMessagePage(@Param("page") Page page, @Param("ew") QueryWrapper ew, @Param("userId") Long userId, @Param("userName") String userName); diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index 94f74dd..80017a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -143,7 +143,7 @@ set_top as set_top from system_notice where system_type = '2' and id not in (select biz_id from message_1 where message_module = '通知公告' and message_type = '单位通知') - and notice_company = #{userCompanyName} + and (notice_company = #{userCompanyName} or notice_company = #{topCompanyName}) ), message_3 as ( select diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml index 278476b..a9ffc3c 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml @@ -31,7 +31,7 @@ 0 ) AS yearChecked - FROM eqpt_equipment_info e + FROM eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id LEFT JOIN sys_dept d ON e.dept_id = d.id WHERE @@ -60,8 +60,9 @@ dept_id as deptId, director_name as directorName, certificate_valid as certificateValid, - usage_status as usageStatus - from eqpt_equipment_info + usage_status as usageStatus, + model as model + from eqpt_equipment_info_view ${ew.sqlSegment} @@ -102,10 +103,11 @@ e.director_name as directorName, e.certificate_valid as certificateValid, e.usage_status as usageStatus, + e.model as model, r.real_deliver_time, '西昌卫星发射中心计量测试站' as checkOrganization, r.sample_status as sampleStatus - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -140,7 +142,7 @@ #{item} ,1,0)) as checked - from eqpt_equipment_info e + from eqpt_equipment_info_view e LEFT JOIN latest_relation r ON e.id = r.sample_id @@ -166,14 +168,14 @@ UNION ALL SELECT id AS equipment_id, certificate_valid - FROM eqpt_equipment_info + FROM eqpt_equipment_info_view ) SELECT count( DISTINCT e.id ) as count, DATE_FORMAT( c.certificate_valid, '%Y-%m' ) as name FROM - eqpt_equipment_info e + eqpt_equipment_info_view e RIGHT JOIN certificate_info c ON e.id = c.equipment_id WHERE e.is_del = 0 AND e.equipment_type = '1' AND c.certificate_valid = ]]> #{startTime} @@ -192,7 +194,7 @@ count( DISTINCT e.id ) AS count, DATE_FORMAT( r.measure_complete_time, '%Y-%m' ) AS NAME FROM - eqpt_equipment_info e + eqpt_equipment_info_view e LEFT JOIN biz_business_order_sample_relation r ON e.id = r.sample_id WHERE r.sample_status IN diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index ead9a9b..cf19d86 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-job - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f50ab7e..fc189de 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.3 + 1.2.0.4 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 00b91f1..3732b87 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 574c3fb..f21a5d4 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.3 + 1.2.0.4 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-model - 1.2.0.3 + 1.2.0.4 com.casic casic-metering-common - 1.2.0.3 + 1.2.0.4 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index d24f084..70d0301 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -103,7 +103,9 @@ Dept company = systemDeptService.getUserCompany(); queryWrapper.eq("notify_dept_id",company.getId()); Long userId = permissionContext.getAuthService().getLoginUser().getId(); - List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName()); + List allDeptList = permissionContext.getDeptService().list(null); + Dept top = allDeptList.stream().filter(i -> ObjectUtil.isEmpty(i.getPid()) || i.getPid() < 0).findFirst().orElse(null); + List list = this.baseMapper.noticeMessagePage(page,queryWrapper,userId,company.getId(),company.getFullName(),top.getFullName()); list.forEach(i->i.setNotifyUserId(userId)); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 223c875..bd57777 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -22,10 +22,12 @@ import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.board.NoticeBoardMapper; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.board.INoticeBoardService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.system.IRemindConfigService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -49,6 +51,7 @@ private final IRemindConfigService remindConfigService; private final NoticeBoardMapper noticeBoardMapper; + private final ISystemDeptService systemDeptService; private final List InCheckSampleStatus = Arrays.asList(CheckCompletionEnum.IN_CHECK,CheckCompletionEnum.UNCHECK,CheckCompletionEnum.CHECKED); @@ -136,15 +139,23 @@ } private List getScopeOrCurrentDeptIds(){ - if(ShiroKit.isAdmin()){ - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { - return dataScope.getDeptIds(); - } - }else { - return getCurrentDeptIds(); +// if(ShiroKit.isAdmin()){ +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { +// return dataScope.getDeptIds(); +// } +// }else { +// return getCurrentDeptIds(); +// } +// return null; + + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); } - return null; + return userDeptIds; } @@ -396,7 +407,7 @@ if(key.split(";;;").length >= 4){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setDeptName(key.split(";;;")[3]); item.setCount(deptGroupMap.get(key).size()); @@ -414,7 +425,7 @@ if(key.split(";;;").length >= 3){ EquipmentMultiAggr.EquipmentSimpleList item = new EquipmentMultiAggr.EquipmentSimpleList(); item.setEquipmentName(key.split(";;;")[0]); - item.setModel(key.split(";;;")[1]); + item.setModel("null".equals(key.split(";;;")[1]) ? "" : key.split(";;;")[1]); item.setCompanyName(key.split(";;;")[2]); item.setCount(companyGroupMap.get(key).size()); companyGroupList.add(item); @@ -429,8 +440,17 @@ EquipmentQueryForm queryForm = new EquipmentQueryForm(); if(CollUtil.isEmpty(deptIds)){ deptIds = getScopeOrCurrentDeptIds(); + queryForm.setDeptIds(deptIds); + }else { + List subDeptIds = new ArrayList<>(); + List allDeptList = permissionContext.getDeptService().list(null); + for (Long deptId : deptIds) { + subDeptIds.add(deptId); + subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); + } + queryForm.setDeptIds(subDeptIds); } - queryForm.setDeptIds(deptIds); + queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); if(CollUtil.isEmpty(list)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index f16c7b3..c978172 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -360,7 +360,8 @@ if(CollUtil.isEmpty(itemModels)){ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); }else if(itemModels.size() == 1){ - if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction())){ + if(ObjectUtil.isNotEmpty(importDTO.getHelpInstruction()) && + !importDTO.getHelpInstruction().equals(itemModels.get(0).getHelpInstruction())){ throw new BusinessException(1500, String.format(validMsg, i + 1, "辅助字段不存在")); } importDTO.setModelId(itemModels.get(0).getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java index 6103000..9251df5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemLocationServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.equipment.EquipmentInfoApproval; @@ -26,6 +27,8 @@ import java.util.Date; import java.util.List; +import static com.casic.missiles.core.datascope.ScopeEnums.ALL_TYPE; + /** *

* 受检系统-系统管理-安装位置管理 服务实现类 @@ -113,8 +116,12 @@ } @NotNull - private static QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { + private QueryWrapper getQueryWrapper(Long searchId,Long positionId, String installLocation) { QueryWrapper queryWrapper = new QueryWrapper<>(); + DataScope dataScope = authService.getLoginUserDataScope(); + if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ + queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + } if(ObjectUtil.isNotEmpty(positionId)){ queryWrapper.eq("position_id",positionId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java index 7bff524..3b2e9f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractUserService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.equipment.EquipmentInfoApproval; @@ -26,6 +27,8 @@ import java.util.Date; import java.util.List; +import static com.casic.missiles.core.datascope.ScopeEnums.ALL_TYPE; + /** *

* 受检系统-系统管理-岗位管理 服务实现类 @@ -112,8 +115,12 @@ } @NotNull - private static QueryWrapper getQueryWrapper(Long searchId, String positionName) { + private QueryWrapper getQueryWrapper(Long searchId, String positionName) { QueryWrapper queryWrapper = new QueryWrapper<>(); + DataScope dataScope = authService.getLoginUserDataScope(); + if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ + queryWrapper.in("sub_system_id",dataScope.getDeptIds()); + } if(StrUtil.isNotEmpty(positionName)){ queryWrapper.like("position_name", positionName); } diff --git a/pom.xml b/pom.xml index e3598ec..4aca89e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.2.0.3 + 1.2.0.4 casic-metering-eqpt-xichang pom