diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 1cc3e68..da2dfae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.OrderBackRequest; import com.casic.missiles.dto.business.OrderCheckDTO; import com.casic.missiles.dto.business.OrderListRequest; import com.casic.missiles.dto.business.OrderListResponse; @@ -18,7 +17,6 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; -import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; @@ -26,7 +24,6 @@ import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.business.IBizBusinessOrderSampleRelationService; import com.casic.missiles.service.system.ISystemDeptService; @@ -34,7 +31,6 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -66,8 +62,8 @@ QueryWrapper wrapper = listParamWrapperBuilder(request); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - wrapper.in("dept_id",dataScope.getDeptIds()); + if (!ALL_TYPE.equals(dataScope.getScopeEnums())) { + wrapper.in("dept_id", dataScope.getDeptIds()); } List list = orderListResponseMapper.listPage(page, wrapper); @@ -76,37 +72,54 @@ customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); - if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())) { customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ - if(customerAdviceInfo.getUnBackCount() > 0){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())) { + if (customerAdviceInfo.getUnBackCount() > 0) { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } } - if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ - customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())) { + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0, 10)); } - if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ - customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())) { + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0, 10)); } DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + + //获取已检定设备和总数 + customerAdviceInfo.setVerificationProgress("-/-"); + + List sampleRelations = getDeviceList(customerAdviceInfo.getId()); + if (ObjectUtil.isNotEmpty(sampleRelations)) { + int sumNum = 0; + int checkedNum = 0; + for (BizBusinessOrderSampleRelation relation : sampleRelations) { + sumNum++; + if ("已检完".equals(relation.getMeasureCompletePercent())) { + checkedNum++; + } + } + customerAdviceInfo.setVerificationProgress(checkedNum + "/" + sumNum); + } + } return page; } - private String getConclusion(Long orderId,Long sampleId){ - String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); - if(StrUtil.isNotBlank(conclusion)){ - if(conclusion.contains("不合格")){ + private String getConclusion(Long orderId, Long sampleId) { + String conclusion = sampleRelationMapper.getConclusion(orderId, sampleId); + if (StrUtil.isNotBlank(conclusion)) { + if (conclusion.contains("不合格")) { return "不合格"; - }else if(conclusion.contains("其余所检项目合格")){ + } else if (conclusion.contains("其余所检项目合格")) { return "限用"; - }else { + } else { return "合格"; } } @@ -118,13 +131,13 @@ // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); - if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(orderInfo.getReceiveStatus())) { orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())) { Integer unBackCount = sampleRelationMapper.getUnBackCount(id); - if(unBackCount > 0){ + if (unBackCount > 0) { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } @@ -132,17 +145,17 @@ DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" - ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" + , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); for (BizBusinessOrderSampleRelation relation : orderSampleList) { - if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ - relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + if (StrUtil.isNotEmpty(relation.getMeasureCompleteTime())) { + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0, 10)); } - if("已检完".equals(relation.getMeasureCompletePercent())){ + if ("已检完".equals(relation.getMeasureCompletePercent())) { relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); } DictCodeUtils.convertDictCodeToName(relation); @@ -151,6 +164,22 @@ return ReturnUtil.success(orderInfo); } + /** + * 获取设备信息 + * + * @param orderId + * @return + */ + public List getDeviceList(Long orderId) { + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" +// , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" +// , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + +// " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); + wrapper.eq("order_id", orderId); + return sampleRelationMapper.selectList(wrapper); + } + @Override public ReturnDTO addOrder(BizBusinessOrderInfo businessOrder) { // initOrderInfo(businessOrder); @@ -191,7 +220,7 @@ BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(id); businessOrder.setReceiveStatus(alreadyReceived); - if(this.baseMapper.updateById(businessOrder) > 0){ + if (this.baseMapper.updateById(businessOrder) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -223,44 +252,46 @@ wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } - if(ObjectUtil.isNotEmpty(request.getDeptId())){ + if (ObjectUtil.isNotEmpty(request.getDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(request.getDeptId()); deptIds.addAll(systemDeptService.getIdsByPid(request.getDeptId(), null)); - wrapper.in("dept_id",request.getDeptId()); + wrapper.in("dept_id", request.getDeptId()); } - wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); + wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()), "measure_company", request.getMeasureCompany()); // wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); - wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()), "is_on_site_check", request.getIsOnSiteCheck()); - if(StrUtil.isNotEmpty(request.getOrderStatus())){ - if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.gt("unBackCount",0); - }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.le("unBackCount",0); - }else { - wrapper.eq("receive_status",request.getOrderStatus()); + if (StrUtil.isNotEmpty(request.getOrderStatus())) { + if (OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount", 0); + } else if (OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount", 0); + } else { + wrapper.eq("receive_status", request.getOrderStatus()); } } - if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ - String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); + if (ObjectUtil.isNotEmpty(request.getUsePositionId())) { + String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)", request.getUsePositionId()); wrapper.exists(positionSql); } - if(StrUtil.isNotEmpty(request.getManufactureNo())){ - String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo()); + if (StrUtil.isNotEmpty(request.getManufactureNo())) { + String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')", request.getManufactureNo()); wrapper.exists(manufactureNoSql); } - wrapper.eq("1","1"); + wrapper.eq("1", "1"); wrapper.orderByDesc("create_time"); return wrapper; } @@ -268,9 +299,9 @@ @Override public String checkOrder(BizBusinessOrderInfo businessOrder) { List sampleRelations = businessOrder.getCustomerSampleInfoList(); - if(CollUtil.isNotEmpty(sampleRelations)){ + if (CollUtil.isNotEmpty(sampleRelations)) { List sampleIds = sampleRelations.stream().map(BizBusinessOrderSampleRelation::getSampleId).distinct().collect(Collectors.toList()); - return checkSamples(sampleIds,businessOrder.getId()); + return checkSamples(sampleIds, businessOrder.getId()); } return null; @@ -279,17 +310,33 @@ @Override public String checkSamples(List sampleIds, Long orderId) { List checkRes = this.baseMapper.checkSamples(sampleIds, orderId); - if(CollUtil.isNotEmpty(checkRes)){ - Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); + if (CollUtil.isNotEmpty(checkRes)) { + Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); StringBuilder stringBuilder = new StringBuilder(); for (String manufactureNo : map.keySet()) { List subRes = map.get(manufactureNo); - String orderNos = StrUtil.join(",",subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); - stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,",manufactureNo,subRes.get(0).getEquipmentName(),orderNos)); + String orderNos = StrUtil.join(",", subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); + stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,", manufactureNo, subRes.get(0).getEquipmentName(), orderNos)); } stringBuilder.append("请确认是否继续提交"); return stringBuilder.toString(); } return null; } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("count(1) as deviceNum,sample_name as sampleName"); + wrapper.groupBy("sample_name"); + wrapper.eq("order_id", id); + return ReturnUtil.success(sampleRelationMapper.selectList(wrapper)); + } + + @Override + public ReturnDTO contentBySampleIds(List ids) { + + return ReturnUtil.success(sampleRelationMapper.getDeviceContentResponse(ids)); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 1cc3e68..da2dfae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.OrderBackRequest; import com.casic.missiles.dto.business.OrderCheckDTO; import com.casic.missiles.dto.business.OrderListRequest; import com.casic.missiles.dto.business.OrderListResponse; @@ -18,7 +17,6 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; -import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; @@ -26,7 +24,6 @@ import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.business.IBizBusinessOrderSampleRelationService; import com.casic.missiles.service.system.ISystemDeptService; @@ -34,7 +31,6 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -66,8 +62,8 @@ QueryWrapper wrapper = listParamWrapperBuilder(request); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - wrapper.in("dept_id",dataScope.getDeptIds()); + if (!ALL_TYPE.equals(dataScope.getScopeEnums())) { + wrapper.in("dept_id", dataScope.getDeptIds()); } List list = orderListResponseMapper.listPage(page, wrapper); @@ -76,37 +72,54 @@ customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); - if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())) { customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ - if(customerAdviceInfo.getUnBackCount() > 0){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())) { + if (customerAdviceInfo.getUnBackCount() > 0) { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } } - if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ - customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())) { + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0, 10)); } - if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ - customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())) { + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0, 10)); } DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + + //获取已检定设备和总数 + customerAdviceInfo.setVerificationProgress("-/-"); + + List sampleRelations = getDeviceList(customerAdviceInfo.getId()); + if (ObjectUtil.isNotEmpty(sampleRelations)) { + int sumNum = 0; + int checkedNum = 0; + for (BizBusinessOrderSampleRelation relation : sampleRelations) { + sumNum++; + if ("已检完".equals(relation.getMeasureCompletePercent())) { + checkedNum++; + } + } + customerAdviceInfo.setVerificationProgress(checkedNum + "/" + sumNum); + } + } return page; } - private String getConclusion(Long orderId,Long sampleId){ - String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); - if(StrUtil.isNotBlank(conclusion)){ - if(conclusion.contains("不合格")){ + private String getConclusion(Long orderId, Long sampleId) { + String conclusion = sampleRelationMapper.getConclusion(orderId, sampleId); + if (StrUtil.isNotBlank(conclusion)) { + if (conclusion.contains("不合格")) { return "不合格"; - }else if(conclusion.contains("其余所检项目合格")){ + } else if (conclusion.contains("其余所检项目合格")) { return "限用"; - }else { + } else { return "合格"; } } @@ -118,13 +131,13 @@ // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); - if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(orderInfo.getReceiveStatus())) { orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())) { Integer unBackCount = sampleRelationMapper.getUnBackCount(id); - if(unBackCount > 0){ + if (unBackCount > 0) { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } @@ -132,17 +145,17 @@ DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" - ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" + , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); for (BizBusinessOrderSampleRelation relation : orderSampleList) { - if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ - relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + if (StrUtil.isNotEmpty(relation.getMeasureCompleteTime())) { + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0, 10)); } - if("已检完".equals(relation.getMeasureCompletePercent())){ + if ("已检完".equals(relation.getMeasureCompletePercent())) { relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); } DictCodeUtils.convertDictCodeToName(relation); @@ -151,6 +164,22 @@ return ReturnUtil.success(orderInfo); } + /** + * 获取设备信息 + * + * @param orderId + * @return + */ + public List getDeviceList(Long orderId) { + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" +// , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" +// , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + +// " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); + wrapper.eq("order_id", orderId); + return sampleRelationMapper.selectList(wrapper); + } + @Override public ReturnDTO addOrder(BizBusinessOrderInfo businessOrder) { // initOrderInfo(businessOrder); @@ -191,7 +220,7 @@ BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(id); businessOrder.setReceiveStatus(alreadyReceived); - if(this.baseMapper.updateById(businessOrder) > 0){ + if (this.baseMapper.updateById(businessOrder) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -223,44 +252,46 @@ wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } - if(ObjectUtil.isNotEmpty(request.getDeptId())){ + if (ObjectUtil.isNotEmpty(request.getDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(request.getDeptId()); deptIds.addAll(systemDeptService.getIdsByPid(request.getDeptId(), null)); - wrapper.in("dept_id",request.getDeptId()); + wrapper.in("dept_id", request.getDeptId()); } - wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); + wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()), "measure_company", request.getMeasureCompany()); // wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); - wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()), "is_on_site_check", request.getIsOnSiteCheck()); - if(StrUtil.isNotEmpty(request.getOrderStatus())){ - if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.gt("unBackCount",0); - }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.le("unBackCount",0); - }else { - wrapper.eq("receive_status",request.getOrderStatus()); + if (StrUtil.isNotEmpty(request.getOrderStatus())) { + if (OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount", 0); + } else if (OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount", 0); + } else { + wrapper.eq("receive_status", request.getOrderStatus()); } } - if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ - String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); + if (ObjectUtil.isNotEmpty(request.getUsePositionId())) { + String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)", request.getUsePositionId()); wrapper.exists(positionSql); } - if(StrUtil.isNotEmpty(request.getManufactureNo())){ - String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo()); + if (StrUtil.isNotEmpty(request.getManufactureNo())) { + String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')", request.getManufactureNo()); wrapper.exists(manufactureNoSql); } - wrapper.eq("1","1"); + wrapper.eq("1", "1"); wrapper.orderByDesc("create_time"); return wrapper; } @@ -268,9 +299,9 @@ @Override public String checkOrder(BizBusinessOrderInfo businessOrder) { List sampleRelations = businessOrder.getCustomerSampleInfoList(); - if(CollUtil.isNotEmpty(sampleRelations)){ + if (CollUtil.isNotEmpty(sampleRelations)) { List sampleIds = sampleRelations.stream().map(BizBusinessOrderSampleRelation::getSampleId).distinct().collect(Collectors.toList()); - return checkSamples(sampleIds,businessOrder.getId()); + return checkSamples(sampleIds, businessOrder.getId()); } return null; @@ -279,17 +310,33 @@ @Override public String checkSamples(List sampleIds, Long orderId) { List checkRes = this.baseMapper.checkSamples(sampleIds, orderId); - if(CollUtil.isNotEmpty(checkRes)){ - Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); + if (CollUtil.isNotEmpty(checkRes)) { + Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); StringBuilder stringBuilder = new StringBuilder(); for (String manufactureNo : map.keySet()) { List subRes = map.get(manufactureNo); - String orderNos = StrUtil.join(",",subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); - stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,",manufactureNo,subRes.get(0).getEquipmentName(),orderNos)); + String orderNos = StrUtil.join(",", subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); + stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,", manufactureNo, subRes.get(0).getEquipmentName(), orderNos)); } stringBuilder.append("请确认是否继续提交"); return stringBuilder.toString(); } return null; } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("count(1) as deviceNum,sample_name as sampleName"); + wrapper.groupBy("sample_name"); + wrapper.eq("order_id", id); + return ReturnUtil.success(sampleRelationMapper.selectList(wrapper)); + } + + @Override + public ReturnDTO contentBySampleIds(List ids) { + + return ReturnUtil.success(sampleRelationMapper.getDeviceContentResponse(ids)); + } } 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 8ebebe7..6bc2cef 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 @@ -271,6 +271,7 @@ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) { String existSql = String.format("(select id from eqpt_equipment_group_relation where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId()); @@ -285,7 +286,9 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify"); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart()); - queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getLevel()), "level", queryForm.getLevel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getRemark()), "remark", queryForm.getRemark()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()), "category", queryForm.getCategory()); } queryWrapper.eq("is_del", 0); return queryWrapper; @@ -914,7 +917,7 @@ queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); - queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); // queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckStatus()), "check_status", queryForm.getCheckStatus()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); @@ -1266,4 +1269,9 @@ }); return defaultLabMap; } + + @Override + public List manufacturerList(String manufacturerName) { + return this.baseMapper.manufacturerList(manufacturerName); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 1cc3e68..da2dfae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.OrderBackRequest; import com.casic.missiles.dto.business.OrderCheckDTO; import com.casic.missiles.dto.business.OrderListRequest; import com.casic.missiles.dto.business.OrderListResponse; @@ -18,7 +17,6 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; -import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; @@ -26,7 +24,6 @@ import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.business.IBizBusinessOrderSampleRelationService; import com.casic.missiles.service.system.ISystemDeptService; @@ -34,7 +31,6 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -66,8 +62,8 @@ QueryWrapper wrapper = listParamWrapperBuilder(request); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - wrapper.in("dept_id",dataScope.getDeptIds()); + if (!ALL_TYPE.equals(dataScope.getScopeEnums())) { + wrapper.in("dept_id", dataScope.getDeptIds()); } List list = orderListResponseMapper.listPage(page, wrapper); @@ -76,37 +72,54 @@ customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); - if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())) { customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ - if(customerAdviceInfo.getUnBackCount() > 0){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())) { + if (customerAdviceInfo.getUnBackCount() > 0) { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } } - if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ - customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())) { + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0, 10)); } - if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ - customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())) { + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0, 10)); } DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + + //获取已检定设备和总数 + customerAdviceInfo.setVerificationProgress("-/-"); + + List sampleRelations = getDeviceList(customerAdviceInfo.getId()); + if (ObjectUtil.isNotEmpty(sampleRelations)) { + int sumNum = 0; + int checkedNum = 0; + for (BizBusinessOrderSampleRelation relation : sampleRelations) { + sumNum++; + if ("已检完".equals(relation.getMeasureCompletePercent())) { + checkedNum++; + } + } + customerAdviceInfo.setVerificationProgress(checkedNum + "/" + sumNum); + } + } return page; } - private String getConclusion(Long orderId,Long sampleId){ - String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); - if(StrUtil.isNotBlank(conclusion)){ - if(conclusion.contains("不合格")){ + private String getConclusion(Long orderId, Long sampleId) { + String conclusion = sampleRelationMapper.getConclusion(orderId, sampleId); + if (StrUtil.isNotBlank(conclusion)) { + if (conclusion.contains("不合格")) { return "不合格"; - }else if(conclusion.contains("其余所检项目合格")){ + } else if (conclusion.contains("其余所检项目合格")) { return "限用"; - }else { + } else { return "合格"; } } @@ -118,13 +131,13 @@ // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); - if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(orderInfo.getReceiveStatus())) { orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())) { Integer unBackCount = sampleRelationMapper.getUnBackCount(id); - if(unBackCount > 0){ + if (unBackCount > 0) { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } @@ -132,17 +145,17 @@ DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" - ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" + , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); for (BizBusinessOrderSampleRelation relation : orderSampleList) { - if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ - relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + if (StrUtil.isNotEmpty(relation.getMeasureCompleteTime())) { + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0, 10)); } - if("已检完".equals(relation.getMeasureCompletePercent())){ + if ("已检完".equals(relation.getMeasureCompletePercent())) { relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); } DictCodeUtils.convertDictCodeToName(relation); @@ -151,6 +164,22 @@ return ReturnUtil.success(orderInfo); } + /** + * 获取设备信息 + * + * @param orderId + * @return + */ + public List getDeviceList(Long orderId) { + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" +// , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" +// , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + +// " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); + wrapper.eq("order_id", orderId); + return sampleRelationMapper.selectList(wrapper); + } + @Override public ReturnDTO addOrder(BizBusinessOrderInfo businessOrder) { // initOrderInfo(businessOrder); @@ -191,7 +220,7 @@ BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(id); businessOrder.setReceiveStatus(alreadyReceived); - if(this.baseMapper.updateById(businessOrder) > 0){ + if (this.baseMapper.updateById(businessOrder) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -223,44 +252,46 @@ wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } - if(ObjectUtil.isNotEmpty(request.getDeptId())){ + if (ObjectUtil.isNotEmpty(request.getDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(request.getDeptId()); deptIds.addAll(systemDeptService.getIdsByPid(request.getDeptId(), null)); - wrapper.in("dept_id",request.getDeptId()); + wrapper.in("dept_id", request.getDeptId()); } - wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); + wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()), "measure_company", request.getMeasureCompany()); // wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); - wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()), "is_on_site_check", request.getIsOnSiteCheck()); - if(StrUtil.isNotEmpty(request.getOrderStatus())){ - if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.gt("unBackCount",0); - }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.le("unBackCount",0); - }else { - wrapper.eq("receive_status",request.getOrderStatus()); + if (StrUtil.isNotEmpty(request.getOrderStatus())) { + if (OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount", 0); + } else if (OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount", 0); + } else { + wrapper.eq("receive_status", request.getOrderStatus()); } } - if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ - String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); + if (ObjectUtil.isNotEmpty(request.getUsePositionId())) { + String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)", request.getUsePositionId()); wrapper.exists(positionSql); } - if(StrUtil.isNotEmpty(request.getManufactureNo())){ - String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo()); + if (StrUtil.isNotEmpty(request.getManufactureNo())) { + String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')", request.getManufactureNo()); wrapper.exists(manufactureNoSql); } - wrapper.eq("1","1"); + wrapper.eq("1", "1"); wrapper.orderByDesc("create_time"); return wrapper; } @@ -268,9 +299,9 @@ @Override public String checkOrder(BizBusinessOrderInfo businessOrder) { List sampleRelations = businessOrder.getCustomerSampleInfoList(); - if(CollUtil.isNotEmpty(sampleRelations)){ + if (CollUtil.isNotEmpty(sampleRelations)) { List sampleIds = sampleRelations.stream().map(BizBusinessOrderSampleRelation::getSampleId).distinct().collect(Collectors.toList()); - return checkSamples(sampleIds,businessOrder.getId()); + return checkSamples(sampleIds, businessOrder.getId()); } return null; @@ -279,17 +310,33 @@ @Override public String checkSamples(List sampleIds, Long orderId) { List checkRes = this.baseMapper.checkSamples(sampleIds, orderId); - if(CollUtil.isNotEmpty(checkRes)){ - Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); + if (CollUtil.isNotEmpty(checkRes)) { + Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); StringBuilder stringBuilder = new StringBuilder(); for (String manufactureNo : map.keySet()) { List subRes = map.get(manufactureNo); - String orderNos = StrUtil.join(",",subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); - stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,",manufactureNo,subRes.get(0).getEquipmentName(),orderNos)); + String orderNos = StrUtil.join(",", subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); + stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,", manufactureNo, subRes.get(0).getEquipmentName(), orderNos)); } stringBuilder.append("请确认是否继续提交"); return stringBuilder.toString(); } return null; } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("count(1) as deviceNum,sample_name as sampleName"); + wrapper.groupBy("sample_name"); + wrapper.eq("order_id", id); + return ReturnUtil.success(sampleRelationMapper.selectList(wrapper)); + } + + @Override + public ReturnDTO contentBySampleIds(List ids) { + + return ReturnUtil.success(sampleRelationMapper.getDeviceContentResponse(ids)); + } } 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 8ebebe7..6bc2cef 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 @@ -271,6 +271,7 @@ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) { String existSql = String.format("(select id from eqpt_equipment_group_relation where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId()); @@ -285,7 +286,9 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify"); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart()); - queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getLevel()), "level", queryForm.getLevel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getRemark()), "remark", queryForm.getRemark()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()), "category", queryForm.getCategory()); } queryWrapper.eq("is_del", 0); return queryWrapper; @@ -914,7 +917,7 @@ queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); - queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); // queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckStatus()), "check_status", queryForm.getCheckStatus()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); @@ -1266,4 +1269,9 @@ }); return defaultLabMap; } + + @Override + public List manufacturerList(String manufacturerName) { + return this.baseMapper.manufacturerList(manufacturerName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 362252d..4b93d0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; +import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; +import com.casic.missiles.mapper.subcontract.SubcontractOrderRelationMapper; import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractOrder; -import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; @@ -27,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -60,6 +64,8 @@ private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; + @Resource + private SubcontractOrderRelationMapper subcontractOrderRelationMapper; @Override public Long saveOrUpdateApproval(SubcontractOrderForm form) { @@ -87,17 +93,17 @@ public SubcontractOrderForm detail(Long orderId) { SubcontractOrder Order = this.getById(orderId); SubcontractOrderForm form = new SubcontractOrderForm(); - BeanUtil.copyProperties(Order,form); + BeanUtil.copyProperties(Order, form); - if(StrUtil.isEmpty(form.getCreateDeptName())){ + if (StrUtil.isEmpty(form.getCreateDeptName())) { form.setCreateDeptName(systemDeptService.getParentsDeptName(form.getCreateDeptId())); } - if(StrUtil.isEmpty(form.getCreateCompanyName())){ + if (StrUtil.isEmpty(form.getCreateCompanyName())) { form.setCreateCompanyName(systemDeptService.getDeptName(form.getCreateCompanyId())); } Subcontractor subcontractor = subcontractorService.getById(form.getSubcontractorId()); - if(ObjectUtil.isNotEmpty(subcontractor)){ + if (ObjectUtil.isNotEmpty(subcontractor)) { form.setSubcontractorNo(subcontractor.getSubcontractorNo()); form.setSubcontractorCompanyName(subcontractor.getCompanyName()); form.setFax(subcontractor.getFax()); @@ -150,7 +156,7 @@ queryWrapper.like("order_no", queryForm.getOrderNo()); } if (StrUtil.isNotEmpty(queryForm.getSubcontractorCompanyName())) { - String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); + String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')", queryForm.getSubcontractorCompanyName()); queryWrapper.exists(sql); } if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) { @@ -162,14 +168,14 @@ if (StrUtil.isNotEmpty(queryForm.getCreateTimeEnd())) { queryWrapper.le("create_time", queryForm.getCreateTimeEnd()); } - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()),"create_dept_name",queryForm.getCreateDeptName()); - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()),"create_company_name",queryForm.getCreateCompanyName()); - queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()),"create_company_id",queryForm.getCreateCompanyId()); - if(ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())){ + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()), "create_dept_name", queryForm.getCreateDeptName()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()), "create_company_name", queryForm.getCreateCompanyName()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()), "create_company_id", queryForm.getCreateCompanyId()); + if (ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(queryForm.getCreateDeptId()); - deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(),null)); - queryWrapper.in("create_dept_id",deptIds); + deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(), null)); + queryWrapper.in("create_dept_id", deptIds); } return queryWrapper; } @@ -198,10 +204,10 @@ @Override public SubcontractOrder warpper(SubcontractOrder obj) { super.warpper(obj); - if(StrUtil.isEmpty(obj.getCreateDeptName())){ + if (StrUtil.isEmpty(obj.getCreateDeptName())) { obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId())); } - if(StrUtil.isEmpty(obj.getCreateCompanyName())){ + if (StrUtil.isEmpty(obj.getCreateCompanyName())) { obj.setCreateCompanyName(systemDeptService.getDeptName(obj.getCreateCompanyId())); } return obj; @@ -211,5 +217,17 @@ public void setBizNo(SubcontractOrder obj) { obj.setBizNo(obj.getOrderNo()); } - + + + @Override + public ReturnDTO contentBySampleIds(List ids) { + return ReturnUtil.success(subcontractOrderRelationMapper.getDeviceContentResponse(ids)); + } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + return ReturnUtil.success(this.baseMapper.statisticsByDevice(id)); + + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 1cc3e68..da2dfae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.OrderBackRequest; import com.casic.missiles.dto.business.OrderCheckDTO; import com.casic.missiles.dto.business.OrderListRequest; import com.casic.missiles.dto.business.OrderListResponse; @@ -18,7 +17,6 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; -import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; @@ -26,7 +24,6 @@ import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.business.IBizBusinessOrderSampleRelationService; import com.casic.missiles.service.system.ISystemDeptService; @@ -34,7 +31,6 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -66,8 +62,8 @@ QueryWrapper wrapper = listParamWrapperBuilder(request); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - wrapper.in("dept_id",dataScope.getDeptIds()); + if (!ALL_TYPE.equals(dataScope.getScopeEnums())) { + wrapper.in("dept_id", dataScope.getDeptIds()); } List list = orderListResponseMapper.listPage(page, wrapper); @@ -76,37 +72,54 @@ customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); - if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())) { customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ - if(customerAdviceInfo.getUnBackCount() > 0){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())) { + if (customerAdviceInfo.getUnBackCount() > 0) { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } } - if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ - customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())) { + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0, 10)); } - if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ - customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())) { + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0, 10)); } DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + + //获取已检定设备和总数 + customerAdviceInfo.setVerificationProgress("-/-"); + + List sampleRelations = getDeviceList(customerAdviceInfo.getId()); + if (ObjectUtil.isNotEmpty(sampleRelations)) { + int sumNum = 0; + int checkedNum = 0; + for (BizBusinessOrderSampleRelation relation : sampleRelations) { + sumNum++; + if ("已检完".equals(relation.getMeasureCompletePercent())) { + checkedNum++; + } + } + customerAdviceInfo.setVerificationProgress(checkedNum + "/" + sumNum); + } + } return page; } - private String getConclusion(Long orderId,Long sampleId){ - String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); - if(StrUtil.isNotBlank(conclusion)){ - if(conclusion.contains("不合格")){ + private String getConclusion(Long orderId, Long sampleId) { + String conclusion = sampleRelationMapper.getConclusion(orderId, sampleId); + if (StrUtil.isNotBlank(conclusion)) { + if (conclusion.contains("不合格")) { return "不合格"; - }else if(conclusion.contains("其余所检项目合格")){ + } else if (conclusion.contains("其余所检项目合格")) { return "限用"; - }else { + } else { return "合格"; } } @@ -118,13 +131,13 @@ // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); - if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(orderInfo.getReceiveStatus())) { orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())) { Integer unBackCount = sampleRelationMapper.getUnBackCount(id); - if(unBackCount > 0){ + if (unBackCount > 0) { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } @@ -132,17 +145,17 @@ DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" - ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" + , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); for (BizBusinessOrderSampleRelation relation : orderSampleList) { - if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ - relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + if (StrUtil.isNotEmpty(relation.getMeasureCompleteTime())) { + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0, 10)); } - if("已检完".equals(relation.getMeasureCompletePercent())){ + if ("已检完".equals(relation.getMeasureCompletePercent())) { relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); } DictCodeUtils.convertDictCodeToName(relation); @@ -151,6 +164,22 @@ return ReturnUtil.success(orderInfo); } + /** + * 获取设备信息 + * + * @param orderId + * @return + */ + public List getDeviceList(Long orderId) { + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" +// , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" +// , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + +// " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); + wrapper.eq("order_id", orderId); + return sampleRelationMapper.selectList(wrapper); + } + @Override public ReturnDTO addOrder(BizBusinessOrderInfo businessOrder) { // initOrderInfo(businessOrder); @@ -191,7 +220,7 @@ BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(id); businessOrder.setReceiveStatus(alreadyReceived); - if(this.baseMapper.updateById(businessOrder) > 0){ + if (this.baseMapper.updateById(businessOrder) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -223,44 +252,46 @@ wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } - if(ObjectUtil.isNotEmpty(request.getDeptId())){ + if (ObjectUtil.isNotEmpty(request.getDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(request.getDeptId()); deptIds.addAll(systemDeptService.getIdsByPid(request.getDeptId(), null)); - wrapper.in("dept_id",request.getDeptId()); + wrapper.in("dept_id", request.getDeptId()); } - wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); + wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()), "measure_company", request.getMeasureCompany()); // wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); - wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()), "is_on_site_check", request.getIsOnSiteCheck()); - if(StrUtil.isNotEmpty(request.getOrderStatus())){ - if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.gt("unBackCount",0); - }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.le("unBackCount",0); - }else { - wrapper.eq("receive_status",request.getOrderStatus()); + if (StrUtil.isNotEmpty(request.getOrderStatus())) { + if (OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount", 0); + } else if (OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount", 0); + } else { + wrapper.eq("receive_status", request.getOrderStatus()); } } - if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ - String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); + if (ObjectUtil.isNotEmpty(request.getUsePositionId())) { + String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)", request.getUsePositionId()); wrapper.exists(positionSql); } - if(StrUtil.isNotEmpty(request.getManufactureNo())){ - String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo()); + if (StrUtil.isNotEmpty(request.getManufactureNo())) { + String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')", request.getManufactureNo()); wrapper.exists(manufactureNoSql); } - wrapper.eq("1","1"); + wrapper.eq("1", "1"); wrapper.orderByDesc("create_time"); return wrapper; } @@ -268,9 +299,9 @@ @Override public String checkOrder(BizBusinessOrderInfo businessOrder) { List sampleRelations = businessOrder.getCustomerSampleInfoList(); - if(CollUtil.isNotEmpty(sampleRelations)){ + if (CollUtil.isNotEmpty(sampleRelations)) { List sampleIds = sampleRelations.stream().map(BizBusinessOrderSampleRelation::getSampleId).distinct().collect(Collectors.toList()); - return checkSamples(sampleIds,businessOrder.getId()); + return checkSamples(sampleIds, businessOrder.getId()); } return null; @@ -279,17 +310,33 @@ @Override public String checkSamples(List sampleIds, Long orderId) { List checkRes = this.baseMapper.checkSamples(sampleIds, orderId); - if(CollUtil.isNotEmpty(checkRes)){ - Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); + if (CollUtil.isNotEmpty(checkRes)) { + Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); StringBuilder stringBuilder = new StringBuilder(); for (String manufactureNo : map.keySet()) { List subRes = map.get(manufactureNo); - String orderNos = StrUtil.join(",",subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); - stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,",manufactureNo,subRes.get(0).getEquipmentName(),orderNos)); + String orderNos = StrUtil.join(",", subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); + stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,", manufactureNo, subRes.get(0).getEquipmentName(), orderNos)); } stringBuilder.append("请确认是否继续提交"); return stringBuilder.toString(); } return null; } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("count(1) as deviceNum,sample_name as sampleName"); + wrapper.groupBy("sample_name"); + wrapper.eq("order_id", id); + return ReturnUtil.success(sampleRelationMapper.selectList(wrapper)); + } + + @Override + public ReturnDTO contentBySampleIds(List ids) { + + return ReturnUtil.success(sampleRelationMapper.getDeviceContentResponse(ids)); + } } 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 8ebebe7..6bc2cef 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 @@ -271,6 +271,7 @@ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) { String existSql = String.format("(select id from eqpt_equipment_group_relation where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId()); @@ -285,7 +286,9 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify"); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart()); - queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getLevel()), "level", queryForm.getLevel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getRemark()), "remark", queryForm.getRemark()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()), "category", queryForm.getCategory()); } queryWrapper.eq("is_del", 0); return queryWrapper; @@ -914,7 +917,7 @@ queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); - queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); // queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckStatus()), "check_status", queryForm.getCheckStatus()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); @@ -1266,4 +1269,9 @@ }); return defaultLabMap; } + + @Override + public List manufacturerList(String manufacturerName) { + return this.baseMapper.manufacturerList(manufacturerName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 362252d..4b93d0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; +import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; +import com.casic.missiles.mapper.subcontract.SubcontractOrderRelationMapper; import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractOrder; -import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; @@ -27,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -60,6 +64,8 @@ private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; + @Resource + private SubcontractOrderRelationMapper subcontractOrderRelationMapper; @Override public Long saveOrUpdateApproval(SubcontractOrderForm form) { @@ -87,17 +93,17 @@ public SubcontractOrderForm detail(Long orderId) { SubcontractOrder Order = this.getById(orderId); SubcontractOrderForm form = new SubcontractOrderForm(); - BeanUtil.copyProperties(Order,form); + BeanUtil.copyProperties(Order, form); - if(StrUtil.isEmpty(form.getCreateDeptName())){ + if (StrUtil.isEmpty(form.getCreateDeptName())) { form.setCreateDeptName(systemDeptService.getParentsDeptName(form.getCreateDeptId())); } - if(StrUtil.isEmpty(form.getCreateCompanyName())){ + if (StrUtil.isEmpty(form.getCreateCompanyName())) { form.setCreateCompanyName(systemDeptService.getDeptName(form.getCreateCompanyId())); } Subcontractor subcontractor = subcontractorService.getById(form.getSubcontractorId()); - if(ObjectUtil.isNotEmpty(subcontractor)){ + if (ObjectUtil.isNotEmpty(subcontractor)) { form.setSubcontractorNo(subcontractor.getSubcontractorNo()); form.setSubcontractorCompanyName(subcontractor.getCompanyName()); form.setFax(subcontractor.getFax()); @@ -150,7 +156,7 @@ queryWrapper.like("order_no", queryForm.getOrderNo()); } if (StrUtil.isNotEmpty(queryForm.getSubcontractorCompanyName())) { - String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); + String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')", queryForm.getSubcontractorCompanyName()); queryWrapper.exists(sql); } if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) { @@ -162,14 +168,14 @@ if (StrUtil.isNotEmpty(queryForm.getCreateTimeEnd())) { queryWrapper.le("create_time", queryForm.getCreateTimeEnd()); } - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()),"create_dept_name",queryForm.getCreateDeptName()); - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()),"create_company_name",queryForm.getCreateCompanyName()); - queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()),"create_company_id",queryForm.getCreateCompanyId()); - if(ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())){ + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()), "create_dept_name", queryForm.getCreateDeptName()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()), "create_company_name", queryForm.getCreateCompanyName()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()), "create_company_id", queryForm.getCreateCompanyId()); + if (ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(queryForm.getCreateDeptId()); - deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(),null)); - queryWrapper.in("create_dept_id",deptIds); + deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(), null)); + queryWrapper.in("create_dept_id", deptIds); } return queryWrapper; } @@ -198,10 +204,10 @@ @Override public SubcontractOrder warpper(SubcontractOrder obj) { super.warpper(obj); - if(StrUtil.isEmpty(obj.getCreateDeptName())){ + if (StrUtil.isEmpty(obj.getCreateDeptName())) { obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId())); } - if(StrUtil.isEmpty(obj.getCreateCompanyName())){ + if (StrUtil.isEmpty(obj.getCreateCompanyName())) { obj.setCreateCompanyName(systemDeptService.getDeptName(obj.getCreateCompanyId())); } return obj; @@ -211,5 +217,17 @@ public void setBizNo(SubcontractOrder obj) { obj.setBizNo(obj.getOrderNo()); } - + + + @Override + public ReturnDTO contentBySampleIds(List ids) { + return ReturnUtil.success(subcontractOrderRelationMapper.getDeviceContentResponse(ids)); + } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + return ReturnUtil.success(this.baseMapper.statisticsByDevice(id)); + + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java index a773f0f..e5c64fa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.dto.subcontract.SubcontractReviewForm; @@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; /** *

@@ -28,5 +30,9 @@ SubcontractOrderForm detail(Long orderId); + ReturnDTO contentBySampleIds(List ids); + + ReturnDTO statisticsByDevice(Long id); + void exportFile(ExportDTO exportDTO, HttpServletResponse response); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index fe60a44..4565d75 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 43a3393..6564020 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 36aa2ed..dda66cf 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.business.SampleDispatchListRequest; import com.casic.missiles.dto.business.SampleDispatchListResponse; @@ -43,4 +44,18 @@ @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") Integer getUnBackCount(@Param("orderId")Long orderId); + + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index 4c86d23..388b551 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -67,7 +68,16 @@ List getSubDeliveredIds(); +// @Select("SELECT manufacturer_name as `name`,manufacturer_name as `value` FROM eqpt_system_manufacturer where manufacturer_name LIKE CONCAT('%',#{manufacturerName},'%')") + @Select({""}) + List manufacturerList(@Param("manufacturerName") String manufacturerName); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java index 6814d6e..0161d28 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderMapper.java @@ -1,10 +1,10 @@ package com.casic.missiles.mapper.subcontract; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.subcontract.SubcontractOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.business.DeviceCountResponse; +import com.casic.missiles.model.subcontract.SubcontractOrder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,5 +29,8 @@ @Override List selectList(@Param("ew") Wrapper ew); + @Select("SELECT count(1) as deviceNum,t.equipment_name as deviceTypeName from (SELECT r.equipment_id , e.equipment_name,r.order_id from eqpt_subcontract_order_relation r left join eqpt_equipment_info_view e ON r.equipment_id = e.id) t where t.order_id = #{id} GROUP BY t.equipment_name") + List statisticsByDevice(Long id); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java index 8cc1d28..187eb16 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractOrderRelationMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.subcontract; +import com.casic.missiles.dto.business.DeviceContentResponse; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.subcontract.SubcontractReviewRelation; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +20,17 @@ public interface SubcontractOrderRelationMapper extends BaseMapper { List listByOrder(Long orderId); + + @Select({ + "" + }) + List getDeviceContentResponse(@Param("ids") List ids); } diff --git a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml index ae9a719..b593abc 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/InspectionEquipmentRelationMapper.xml @@ -29,6 +29,7 @@ r.special_require as specialRequire, r.plan_id AS planId, r.remarks AS remarks, + r.subsidiary_field AS subsidiaryField, r.create_time AS createTime, r.update_time AS updateTime, e.equipment_no AS equipmentNo, diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 6511c65..b3aa96c 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.3.5.1 + 1.3.5.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-job - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java index 8067787..f86204a 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/board/NoticeBoardController.java @@ -277,4 +277,10 @@ boardMessageService.setMessageRead(boardMessage); return ReturnUtil.success(); } + + @ApiOperation("审批提醒消息（所有）") + @PostMapping("/message/approveAllListPage") + public ReturnDTO> approveAllListPage(@RequestBody BoardMessageQueryForm queryForm){ + return ReturnUtil.success(super.packForBT(boardMessageService.approveAllListPage(queryForm))); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index be673b8..2623321 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -224,4 +224,11 @@ return ReturnUtil.success(); } + + @ApiOperation("生产厂家下拉接口") + @GetMapping("manufacturerList") + @ResponseBody + public ReturnDTO manufacturerList(String manufacturerName){ + return ReturnUtil.success(equipmentInfoService.manufacturerList(manufacturerName)); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 4d8fb96..efc3ecb 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.OrderBackRequest; @@ -124,4 +125,22 @@ return businessOrderService.updateStatusById(idDTO.getId(), OrderStatusDictEnum.ALREADY_CANCEL); } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.statisticsByDevice(idDTO.getId()); + } + + + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.contentBySampleIds(idDTOs.getIds()); + } } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java index 4b4905a..eae611e 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/PlanController.java @@ -1,50 +1,32 @@ package com.casic.missiles.controller.plan; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentAggr; -import com.casic.missiles.dto.equipment.EquipmentApprovalForm; -import com.casic.missiles.dto.flowable.ApprovalRevokeRequest; -import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; -import com.casic.missiles.dto.flowable.BaseApprovalRequest; import com.casic.missiles.dto.plan.PlanEquipmentAggr; import com.casic.missiles.dto.plan.PlanForm; import com.casic.missiles.dto.plan.PlanQueryForm; import com.casic.missiles.dto.plan.PlanSummary; import com.casic.missiles.handler.EasyExcelTitleHandler; -import com.casic.missiles.model.equipment.EquipmentInfoApproval; import com.casic.missiles.model.plan.Plan; import com.casic.missiles.model.plan.PlanEquipmentRelation; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.service.ICommonApprovalService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.plan.IPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import liquibase.pro.packaged.S; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @RestController diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 4e4fd24..459f20b 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -1,7 +1,6 @@ package com.casic.missiles.controller.subcontract; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; @@ -10,7 +9,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; -import com.sun.org.apache.bcel.internal.generic.RET; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java index bb85dc2..5253b85 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.subcontract; +import cn.hutool.core.lang.Assert; import com.casic.missiles.controller.CommonApprovalController; -import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; @RestController @RequestMapping("/subcontract/order") @@ -54,4 +56,20 @@ service.exportFile(exportDTO,response); } + @ApiOperation("根据设备id，查询上一次任务里的附件和特殊要求") + @PostMapping("/contentBySampleIds") + public ReturnDTO contentBySampleIds(@RequestBody @Valid IdsDTO idDTOs) { + Assert.isFalse(Objects.isNull(idDTOs.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.contentBySampleIds(idDTOs.getIds()); + } + @ApiOperation("详情按照设备分类统计") + @PostMapping("/statisticsByDevice") + public ReturnDTO statisticsByDevice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return service.statisticsByDevice(idDTO.getId()); + } } diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index e93b8f2..7a0f8de 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -122,7 +122,7 @@ #作者 author: zhangyingjie #待生成对象表名 - table-name: eqpt_equipment_borrow,eqpt_equipment_borrow_relation + table-name: eqpt_system_manufacturer prefix: eqpt_ diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 8d90248..50aeee2 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.1 + 1.3.5.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 191a044..cd6d933 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java new file mode 100644 index 0000000..b98b9be --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceContentResponse.java @@ -0,0 +1,24 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceContentResponse { + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "设备id", dataType = "Long") + private Long sampleId; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java new file mode 100644 index 0000000..e7d152e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/DeviceCountResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.business; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/8/10 17:41 + */ +@ApiModel +@Data +public class DeviceCountResponse { + @ApiModelProperty(value = "设备类型名称", dataType = "String") + private String deviceTypeName; + + @ApiModelProperty(value = "数量", dataType = "String") + private String deviceNum; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index 3e92a46..05e9fe8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -83,4 +83,8 @@ @ApiModelProperty(value = "预计送达时间", dataType = "String") private String planDeliverTime; + @ApiModelProperty(value = "检定进度",dataType = "String") + @TableField(exist = false) + private String verificationProgress; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java index 3990cf2..7581e23 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java @@ -91,6 +91,12 @@ @ApiModelProperty("检定去向") private String checkDestination; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("等级") + private String level; + @ApiModelProperty("设备分类") + private String category; @ApiModelProperty("使用状态列表[状态维护选择设备时用]") private List usageStatusList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index badaaab..aa768b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -193,4 +193,8 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty("设备数量") + @TableField(exist = false) + private String deviceNum; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java index e0ce62f..4887568 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionEquipmentRelation.java @@ -74,6 +74,11 @@ @TableField("update_time") private Date updateTime; + + @ApiModelProperty("辅助字段") + @TableField("subsidiary_field") + private String subsidiaryField; + @ApiModelProperty("设备编号") @TableField(exist = false) private String equipmentNo; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 4929039..a7f870f 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.1 + 1.3.5.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-model - 1.3.5.1 + 1.3.5.2 com.casic casic-metering-common - 1.3.5.1 + 1.3.5.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java index 9d8b60a..ac6bcfe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/ICommonApprovalService.java @@ -46,4 +46,6 @@ T warpper(T obj); void setBizNo(T obj); + + List approveAllList(String formId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java index c78b203..c702cf9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/board/IBoardMessageService.java @@ -27,5 +27,7 @@ Page approvedListPage(BoardMessageQueryForm queryForm); + Page approveAllListPage(BoardMessageQueryForm queryForm); + void remindEquipment(EquipmentInfo equipmentInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f112225..a8ec74e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -30,6 +30,10 @@ ReturnDTO updateStatusById(Long id, String alreadyReceived); + ReturnDTO statisticsByDevice(Long id); + + ReturnDTO contentBySampleIds(List ids); + String checkOrder(BizBusinessOrderInfo businessOrder); String checkSamples(List sampleIds, Long orderId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index cf81671..07433d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -93,4 +94,6 @@ void updateCheckDestination(Long modelId); List listRfids(); + + List manufacturerList(String manufacturerName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java index 51c7b10..3ec460f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java @@ -302,6 +302,17 @@ return list; } + + @Override + public List approveAllList(String formId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",formId); + List list = this.list(queryWrapper); + list.forEach(this::warpper); + return list; + } + @Override public QueryWrapper commonQuery(Q queryForm) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 70d0301..0659a9a 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 @@ -273,7 +273,49 @@ } } - private void getMessagePage(Page page, List resultList,BoardMessageQueryForm queryForm) { + + @Override + public Page approveAllListPage(BoardMessageQueryForm queryForm) { + Page page = PageFactory.defaultPage(); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + for (String formId : actionStatusMap.keySet()) { + ApplyFromIdEnum applyFromIdEnum = ApplyFromIdEnum.getByCode(formId); + if(ObjectUtil.isEmpty(applyFromIdEnum)){ + continue; + } + if(StrUtil.isNotEmpty(queryForm.getSourceModule()) && !applyFromIdEnum.getSource().contains(queryForm.getSourceModule())){ + continue; + } + String beanName = actionStatusMap.get(formId).getActionBeanName(); + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(formId)){ + beanName = "equipmentInfoApprovalServiceImpl"; + } + convertApproveAll(SpringContextUtil.getBean(beanName),ApplyFromIdEnum.getByCode(formId),resultList); + } + getMessagePage(page, resultList,queryForm); + return page; + } + + private void convertApproveAll(S service,ApplyFromIdEnum applyFromIdEnum,List resultList){ + List bizList = service.approveAllList(applyFromIdEnum.getCode()); + if(CollUtil.isNotEmpty(bizList)){ + bizList.forEach(item->{ + BoardMessage message = new BoardMessage(); + message.setMessageModule("审批提醒"); + message.setMessageType("审批提醒"); + message.setMessageTopic(applyFromIdEnum.getValue() + item.getBizNo() + "已审批"); + message.setSourceModule(applyFromIdEnum.getSource()); + message.setReadStatus("已审批"); + message.setBizId(item.getId()); + message.setMessageTime(item.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + resultList.add(message); + }); + } + } + + private void getMessagePage(Page page, List resultList, BoardMessageQueryForm queryForm) { if(ObjectUtil.isNotEmpty(queryForm.getMessageStartTime())){ resultList = resultList.stream().filter(i->!i.getMessageTime().before(DateUtil.parseDateTime(queryForm.getMessageStartTime()))).collect(Collectors.toList()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 1cc3e68..da2dfae 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.OrderBackRequest; import com.casic.missiles.dto.business.OrderCheckDTO; import com.casic.missiles.dto.business.OrderListRequest; import com.casic.missiles.dto.business.OrderListResponse; @@ -18,7 +17,6 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; -import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; @@ -26,7 +24,6 @@ import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.business.IBizBusinessOrderSampleRelationService; import com.casic.missiles.service.system.ISystemDeptService; @@ -34,7 +31,6 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -66,8 +62,8 @@ QueryWrapper wrapper = listParamWrapperBuilder(request); DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if(!ALL_TYPE.equals(dataScope.getScopeEnums())){ - wrapper.in("dept_id",dataScope.getDeptIds()); + if (!ALL_TYPE.equals(dataScope.getScopeEnums())) { + wrapper.in("dept_id", dataScope.getDeptIds()); } List list = orderListResponseMapper.listPage(page, wrapper); @@ -76,37 +72,54 @@ customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); - if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())) { customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ - if(customerAdviceInfo.getUnBackCount() > 0){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())) { + if (customerAdviceInfo.getUnBackCount() > 0) { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } } - if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ - customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())) { + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0, 10)); } - if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ - customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + if (StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())) { + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0, 10)); } DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + + //获取已检定设备和总数 + customerAdviceInfo.setVerificationProgress("-/-"); + + List sampleRelations = getDeviceList(customerAdviceInfo.getId()); + if (ObjectUtil.isNotEmpty(sampleRelations)) { + int sumNum = 0; + int checkedNum = 0; + for (BizBusinessOrderSampleRelation relation : sampleRelations) { + sumNum++; + if ("已检完".equals(relation.getMeasureCompletePercent())) { + checkedNum++; + } + } + customerAdviceInfo.setVerificationProgress(checkedNum + "/" + sumNum); + } + } return page; } - private String getConclusion(Long orderId,Long sampleId){ - String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); - if(StrUtil.isNotBlank(conclusion)){ - if(conclusion.contains("不合格")){ + private String getConclusion(Long orderId, Long sampleId) { + String conclusion = sampleRelationMapper.getConclusion(orderId, sampleId); + if (StrUtil.isNotBlank(conclusion)) { + if (conclusion.contains("不合格")) { return "不合格"; - }else if(conclusion.contains("其余所检项目合格")){ + } else if (conclusion.contains("其余所检项目合格")) { return "限用"; - }else { + } else { return "合格"; } } @@ -118,13 +131,13 @@ // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); - if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + if (StrUtil.isNotEmpty(orderInfo.getReceiveStatus())) { orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); - if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + if (OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())) { Integer unBackCount = sampleRelationMapper.getUnBackCount(id); - if(unBackCount > 0){ + if (unBackCount > 0) { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); - }else { + } else { orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); } } @@ -132,17 +145,17 @@ DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" - ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" + , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); for (BizBusinessOrderSampleRelation relation : orderSampleList) { - if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ - relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + if (StrUtil.isNotEmpty(relation.getMeasureCompleteTime())) { + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0, 10)); } - if("已检完".equals(relation.getMeasureCompletePercent())){ + if ("已检完".equals(relation.getMeasureCompletePercent())) { relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); } DictCodeUtils.convertDictCodeToName(relation); @@ -151,6 +164,22 @@ return ReturnUtil.success(orderInfo); } + /** + * 获取设备信息 + * + * @param orderId + * @return + */ + public List getDeviceList(Long orderId) { + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("*", "(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" +// , "(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" +// , "(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + +// " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); + wrapper.eq("order_id", orderId); + return sampleRelationMapper.selectList(wrapper); + } + @Override public ReturnDTO addOrder(BizBusinessOrderInfo businessOrder) { // initOrderInfo(businessOrder); @@ -191,7 +220,7 @@ BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(id); businessOrder.setReceiveStatus(alreadyReceived); - if(this.baseMapper.updateById(businessOrder) > 0){ + if (this.baseMapper.updateById(businessOrder) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -223,44 +252,46 @@ wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if (StringUtils.isNotBlank(request.getCreateStartTime())) { + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getCreateEndTime())) { + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } - if(ObjectUtil.isNotEmpty(request.getDeptId())){ + if (ObjectUtil.isNotEmpty(request.getDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(request.getDeptId()); deptIds.addAll(systemDeptService.getIdsByPid(request.getDeptId(), null)); - wrapper.in("dept_id",request.getDeptId()); + wrapper.in("dept_id", request.getDeptId()); } - wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); + wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()), "measure_company", request.getMeasureCompany()); // wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); - wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()), "is_on_site_check", request.getIsOnSiteCheck()); - if(StrUtil.isNotEmpty(request.getOrderStatus())){ - if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.gt("unBackCount",0); - }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ - wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); - wrapper.le("unBackCount",0); - }else { - wrapper.eq("receive_status",request.getOrderStatus()); + if (StrUtil.isNotEmpty(request.getOrderStatus())) { + if (OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount", 0); + } else if (OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())) { + wrapper.eq("receive_status", OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount", 0); + } else { + wrapper.eq("receive_status", request.getOrderStatus()); } } - if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ - String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); + if (ObjectUtil.isNotEmpty(request.getUsePositionId())) { + String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)", request.getUsePositionId()); wrapper.exists(positionSql); } - if(StrUtil.isNotEmpty(request.getManufactureNo())){ - String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')",request.getManufactureNo()); + if (StrUtil.isNotEmpty(request.getManufactureNo())) { + String manufactureNoSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.manufacture_no like '%%%s%%')", request.getManufactureNo()); wrapper.exists(manufactureNoSql); } - wrapper.eq("1","1"); + wrapper.eq("1", "1"); wrapper.orderByDesc("create_time"); return wrapper; } @@ -268,9 +299,9 @@ @Override public String checkOrder(BizBusinessOrderInfo businessOrder) { List sampleRelations = businessOrder.getCustomerSampleInfoList(); - if(CollUtil.isNotEmpty(sampleRelations)){ + if (CollUtil.isNotEmpty(sampleRelations)) { List sampleIds = sampleRelations.stream().map(BizBusinessOrderSampleRelation::getSampleId).distinct().collect(Collectors.toList()); - return checkSamples(sampleIds,businessOrder.getId()); + return checkSamples(sampleIds, businessOrder.getId()); } return null; @@ -279,17 +310,33 @@ @Override public String checkSamples(List sampleIds, Long orderId) { List checkRes = this.baseMapper.checkSamples(sampleIds, orderId); - if(CollUtil.isNotEmpty(checkRes)){ - Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); + if (CollUtil.isNotEmpty(checkRes)) { + Map> map = checkRes.stream().collect(Collectors.groupingBy(OrderCheckDTO::getManufactureNo)); StringBuilder stringBuilder = new StringBuilder(); for (String manufactureNo : map.keySet()) { List subRes = map.get(manufactureNo); - String orderNos = StrUtil.join(",",subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); - stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,",manufactureNo,subRes.get(0).getEquipmentName(),orderNos)); + String orderNos = StrUtil.join(",", subRes.stream().map(OrderCheckDTO::getOrderNo).distinct().collect(Collectors.toList())); + stringBuilder.append(String.format("编号为%s的%s设备已在任务单%s中,", manufactureNo, subRes.get(0).getEquipmentName(), orderNos)); } stringBuilder.append("请确认是否继续提交"); return stringBuilder.toString(); } return null; } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("count(1) as deviceNum,sample_name as sampleName"); + wrapper.groupBy("sample_name"); + wrapper.eq("order_id", id); + return ReturnUtil.success(sampleRelationMapper.selectList(wrapper)); + } + + @Override + public ReturnDTO contentBySampleIds(List ids) { + + return ReturnUtil.success(sampleRelationMapper.getDeviceContentResponse(ids)); + } } 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 8ebebe7..6bc2cef 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 @@ -271,6 +271,7 @@ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); if (ObjectUtil.isNotEmpty(queryForm.getGroupId())) { String existSql = String.format("(select id from eqpt_equipment_group_relation where group_id = %d and equipment_id = eqpt_equipment_info_view.id)", queryForm.getGroupId()); @@ -285,7 +286,9 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify"); queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart()); - queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getLevel()), "level", queryForm.getLevel()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getRemark()), "remark", queryForm.getRemark()); + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()), "category", queryForm.getCategory()); } queryWrapper.eq("is_del", 0); return queryWrapper; @@ -914,7 +917,7 @@ queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCertificateValidEnd()), "certificate_valid", queryForm.getCertificateValidEnd()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getInstallLocationId()),"install_location_id",queryForm.getInstallLocationId()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInstallLocationExt()),"installLocationExt",queryForm.getInstallLocationExt()); - queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); +// queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckDestination()), "check_destination", queryForm.getCheckDestination()); // queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCheckStatus()), "check_status", queryForm.getCheckStatus()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify()); @@ -1266,4 +1269,9 @@ }); return defaultLabMap; } + + @Override + public List manufacturerList(String manufacturerName) { + return this.baseMapper.manufacturerList(manufacturerName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 362252d..4b93d0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.casic.missiles.dto.ExportDTO; -import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; +import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; +import com.casic.missiles.mapper.subcontract.SubcontractOrderRelationMapper; import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractOrder; -import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; @@ -27,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -60,6 +64,8 @@ private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; + @Resource + private SubcontractOrderRelationMapper subcontractOrderRelationMapper; @Override public Long saveOrUpdateApproval(SubcontractOrderForm form) { @@ -87,17 +93,17 @@ public SubcontractOrderForm detail(Long orderId) { SubcontractOrder Order = this.getById(orderId); SubcontractOrderForm form = new SubcontractOrderForm(); - BeanUtil.copyProperties(Order,form); + BeanUtil.copyProperties(Order, form); - if(StrUtil.isEmpty(form.getCreateDeptName())){ + if (StrUtil.isEmpty(form.getCreateDeptName())) { form.setCreateDeptName(systemDeptService.getParentsDeptName(form.getCreateDeptId())); } - if(StrUtil.isEmpty(form.getCreateCompanyName())){ + if (StrUtil.isEmpty(form.getCreateCompanyName())) { form.setCreateCompanyName(systemDeptService.getDeptName(form.getCreateCompanyId())); } Subcontractor subcontractor = subcontractorService.getById(form.getSubcontractorId()); - if(ObjectUtil.isNotEmpty(subcontractor)){ + if (ObjectUtil.isNotEmpty(subcontractor)) { form.setSubcontractorNo(subcontractor.getSubcontractorNo()); form.setSubcontractorCompanyName(subcontractor.getCompanyName()); form.setFax(subcontractor.getFax()); @@ -150,7 +156,7 @@ queryWrapper.like("order_no", queryForm.getOrderNo()); } if (StrUtil.isNotEmpty(queryForm.getSubcontractorCompanyName())) { - String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); + String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')", queryForm.getSubcontractorCompanyName()); queryWrapper.exists(sql); } if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) { @@ -162,14 +168,14 @@ if (StrUtil.isNotEmpty(queryForm.getCreateTimeEnd())) { queryWrapper.le("create_time", queryForm.getCreateTimeEnd()); } - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()),"create_dept_name",queryForm.getCreateDeptName()); - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()),"create_company_name",queryForm.getCreateCompanyName()); - queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()),"create_company_id",queryForm.getCreateCompanyId()); - if(ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())){ + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()), "create_dept_name", queryForm.getCreateDeptName()); + queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()), "create_company_name", queryForm.getCreateCompanyName()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()), "create_company_id", queryForm.getCreateCompanyId()); + if (ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(queryForm.getCreateDeptId()); - deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(),null)); - queryWrapper.in("create_dept_id",deptIds); + deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getCreateDeptId(), null)); + queryWrapper.in("create_dept_id", deptIds); } return queryWrapper; } @@ -198,10 +204,10 @@ @Override public SubcontractOrder warpper(SubcontractOrder obj) { super.warpper(obj); - if(StrUtil.isEmpty(obj.getCreateDeptName())){ + if (StrUtil.isEmpty(obj.getCreateDeptName())) { obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId())); } - if(StrUtil.isEmpty(obj.getCreateCompanyName())){ + if (StrUtil.isEmpty(obj.getCreateCompanyName())) { obj.setCreateCompanyName(systemDeptService.getDeptName(obj.getCreateCompanyId())); } return obj; @@ -211,5 +217,17 @@ public void setBizNo(SubcontractOrder obj) { obj.setBizNo(obj.getOrderNo()); } - + + + @Override + public ReturnDTO contentBySampleIds(List ids) { + return ReturnUtil.success(subcontractOrderRelationMapper.getDeviceContentResponse(ids)); + } + + @Override + public ReturnDTO statisticsByDevice(Long id) { + + return ReturnUtil.success(this.baseMapper.statisticsByDevice(id)); + + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java index a773f0f..e5c64fa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.dto.subcontract.SubcontractReviewForm; @@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; /** *

@@ -28,5 +30,9 @@ SubcontractOrderForm detail(Long orderId); + ReturnDTO contentBySampleIds(List ids); + + ReturnDTO statisticsByDevice(Long id); + void exportFile(ExportDTO exportDTO, HttpServletResponse response); } diff --git a/pom.xml b/pom.xml index 54ea830..e095831 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.5.1 + 1.3.5.2 casic-metering-eqpt-xichang pom