diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 18976c1..6362888 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; @Service("MeterEquipmentApplyService") @@ -53,8 +54,8 @@ public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ MeterEquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); DictCodeUtils.convertDictCodeToName(equipmentApply); - List equipmentList = equipmentMapper.queryEquipmentList(idDTO.getId()); - equipmentApply.setEquipmentList(equipmentList); + List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -87,9 +88,7 @@ @Override public ReturnDTO deleteEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(equipmentApplyMapper.update(null, updateWrapper)>0){ + if(equipmentApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -99,6 +98,13 @@ public ReturnDTO updateEquipmentApply(MeterEquipmentApply meterEquipmentApply) { int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply); if(updateFlg>0){ + List ids = new ArrayList<>(); + for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) { + if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ + ids.add(applyEquipment.getId()); + } + } + equipmentMapper.deleteBatchIds(ids); boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 18976c1..6362888 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; @Service("MeterEquipmentApplyService") @@ -53,8 +54,8 @@ public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ MeterEquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); DictCodeUtils.convertDictCodeToName(equipmentApply); - List equipmentList = equipmentMapper.queryEquipmentList(idDTO.getId()); - equipmentApply.setEquipmentList(equipmentList); + List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -87,9 +88,7 @@ @Override public ReturnDTO deleteEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(equipmentApplyMapper.update(null, updateWrapper)>0){ + if(equipmentApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -99,6 +98,13 @@ public ReturnDTO updateEquipmentApply(MeterEquipmentApply meterEquipmentApply) { int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply); if(updateFlg>0){ + List ids = new ArrayList<>(); + for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) { + if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ + ids.add(applyEquipment.getId()); + } + } + equipmentMapper.deleteBatchIds(ids); boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 4fd8940..b0e7338 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -63,9 +63,7 @@ @Override public ReturnDTO deletePrice(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterPriceMapper.update(null, updateWrapper)>0){ + if(meterPriceMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -90,8 +88,7 @@ @Override public ReturnDTO updatePriceInfo(MeterPrice meterPrice) { int updateFlag = meterPriceMapper.updateById(meterPrice); - boolean saveOrUpdateFlag = meterHistoricalPriceService.saveOrUpdateBatch(meterPrice.getHistoricalPriceList()); - if(saveOrUpdateFlag && updateFlag>0){ + if(updateFlag>0){ return ReturnUtil.success(); } return ReturnUtil.failed("价格信息编辑失败"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 18976c1..6362888 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; @Service("MeterEquipmentApplyService") @@ -53,8 +54,8 @@ public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ MeterEquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); DictCodeUtils.convertDictCodeToName(equipmentApply); - List equipmentList = equipmentMapper.queryEquipmentList(idDTO.getId()); - equipmentApply.setEquipmentList(equipmentList); + List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -87,9 +88,7 @@ @Override public ReturnDTO deleteEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(equipmentApplyMapper.update(null, updateWrapper)>0){ + if(equipmentApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -99,6 +98,13 @@ public ReturnDTO updateEquipmentApply(MeterEquipmentApply meterEquipmentApply) { int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply); if(updateFlg>0){ + List ids = new ArrayList<>(); + for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) { + if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ + ids.add(applyEquipment.getId()); + } + } + equipmentMapper.deleteBatchIds(ids); boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 4fd8940..b0e7338 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -63,9 +63,7 @@ @Override public ReturnDTO deletePrice(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterPriceMapper.update(null, updateWrapper)>0){ + if(meterPriceMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -90,8 +88,7 @@ @Override public ReturnDTO updatePriceInfo(MeterPrice meterPrice) { int updateFlag = meterPriceMapper.updateById(meterPrice); - boolean saveOrUpdateFlag = meterHistoricalPriceService.saveOrUpdateBatch(meterPrice.getHistoricalPriceList()); - if(saveOrUpdateFlag && updateFlag>0){ + if(updateFlag>0){ return ReturnUtil.success(); } return ReturnUtil.failed("价格信息编辑失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 1672984..c20594a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -103,9 +103,7 @@ @Override public ReturnDTO deleteStaff(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterStaffMapper.update(null, updateWrapper)>0){ + if(meterStaffMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 18976c1..6362888 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; @Service("MeterEquipmentApplyService") @@ -53,8 +54,8 @@ public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ MeterEquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); DictCodeUtils.convertDictCodeToName(equipmentApply); - List equipmentList = equipmentMapper.queryEquipmentList(idDTO.getId()); - equipmentApply.setEquipmentList(equipmentList); + List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -87,9 +88,7 @@ @Override public ReturnDTO deleteEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(equipmentApplyMapper.update(null, updateWrapper)>0){ + if(equipmentApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -99,6 +98,13 @@ public ReturnDTO updateEquipmentApply(MeterEquipmentApply meterEquipmentApply) { int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply); if(updateFlg>0){ + List ids = new ArrayList<>(); + for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) { + if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ + ids.add(applyEquipment.getId()); + } + } + equipmentMapper.deleteBatchIds(ids); boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 4fd8940..b0e7338 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -63,9 +63,7 @@ @Override public ReturnDTO deletePrice(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterPriceMapper.update(null, updateWrapper)>0){ + if(meterPriceMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -90,8 +88,7 @@ @Override public ReturnDTO updatePriceInfo(MeterPrice meterPrice) { int updateFlag = meterPriceMapper.updateById(meterPrice); - boolean saveOrUpdateFlag = meterHistoricalPriceService.saveOrUpdateBatch(meterPrice.getHistoricalPriceList()); - if(saveOrUpdateFlag && updateFlag>0){ + if(updateFlag>0){ return ReturnUtil.success(); } return ReturnUtil.failed("价格信息编辑失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 1672984..c20594a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -103,9 +103,7 @@ @Override public ReturnDTO deleteStaff(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterStaffMapper.update(null, updateWrapper)>0){ + if(meterStaffMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java index 9ff90e4..a579961 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java @@ -73,7 +73,7 @@ public Object standardEquipmentApplyInfo(IdDTO idDTO) throws Exception { // 通过id获取申请记录 MeterStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId()); - // 通过申请记录 + // 通过申请标准装置id获取标准装置详细信息 MeterStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId()); DictCodeUtils.convertDictCodeToName(standardEquipment); result.setMeterStandardEquipment(standardEquipment); @@ -122,9 +122,7 @@ @Override public ReturnDTO deleteStandardEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterStandardApplyMapper.update(null, updateWrapper)>0){ + if(meterStandardApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java index 146695e..edac309 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterEquipmentApplyEquipmentMapper.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.MeterEquipmentApplyEquipment; +import com.casic.missiles.model.MeterFixedAssets; import org.apache.ibatis.annotations.Param; import java.util.List; public interface MeterEquipmentApplyEquipmentMapper extends BaseMapper { - List queryEquipmentList(@Param("id") Long id); + List queryEquipmentList(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml index 1e88d6b..a74e9f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyEquipmentMapper.xml @@ -1,24 +1,19 @@ - SELECT msae.id, - msae.apply_id, - msae.equipment_id, mfa.equipment_no, - msae.measure_range, - sd.SIMPLE_NAME as use_dept, - su.`NAME` as use_person, - msae.financial_value, - msae.asset_origin_value, - msae.overhaul_result, - msae.overhaul_idea, - msae.remark + mfa.equipment_name, + mfa.model_no, + mfa.mesure_range, + mfa.use_dept, + mfa.use_person, + mfa.manager_state, + mfa.valid_date FROM meter_equipment_apply_equipment msae - LEFT JOIN sys_user su ON su.id = msae.use_person - LEFT JOIN sys_dept sd ON sd.id = msae.use_dept LEFT JOIN meter_fixed_assets mfa on msae.equipment_id = mfa.id where 1=1 and msae.is_del != 1 and msae.apply_id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml index cb21176..0fa5666 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -52,10 +52,29 @@ and msa.create_user = #{request.createUser} + + and msa.apply_type = #{request.applyType} + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index 4f3e5f1..6af4dfd 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -46,7 +46,7 @@ and msa.apply_unit = #{request.applyUnit} - and DATE_FORMAT( msa.msa.time, '%Y-%m-%d' ) = #{request.time} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) = #{request.time} and msa.approval_status = #{request.approvalStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 62b50bf..100a544 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -72,6 +72,8 @@ String CAPITAL_SOURCE = "capitalSource"; //标准装置-申请类型 String STANDARD_APPLY_TYPE = "standardApplyType"; + //设备-申请类型 + String EQUIPMENT_APPLY_TYPE = "equipmentApplyType"; //检查结果 String CHECK_RESULT = "checkResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java index e68f279..85a33ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCheckInfoRequest.java @@ -29,9 +29,15 @@ /** - * 检查日期 + * 检查日期开始时间 */ - @ApiModelProperty(value = "检查日期", dataType = "String") - private String checkDate; + @ApiModelProperty(value = "检查日期开始时间", dataType = "String") + private String checkStartDate; + + /** + * 检查日期结束时间 + */ + @ApiModelProperty(value = "检查日期结束时间", dataType = "String") + private String checkEndDate; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java index 2154032..6346ec2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java @@ -46,6 +46,12 @@ private String time; /** + * 申请类型 + */ + @ApiModelProperty(value = "申请类型", dataType = "String",required = true) + private String applyType; + + /** * 审批状态 */ @ApiModelProperty(value = "审批状态", dataType = "String", required = true) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java index ec1a26f..32e7ec0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterCertificate.java @@ -56,7 +56,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java index 277cb9b..0d0857d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java @@ -62,7 +62,7 @@ @TableField("apply_type") @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -198,6 +198,13 @@ private List equipmentList; /** + * 设备详细列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "设备详细列表", dataType = "List") + private List equipmentInfoList; + + /** * 附件列表 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index 8b45093..22d44ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -123,7 +123,7 @@ private String remark; @TableField("is_del") - @ApiModelProperty(value = "删除标记", dataType = "String") + @ApiModelProperty(value = "删除标记", dataType = "Integer") private Integer isDel; @TableField("create_time") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index e46a7b2..7a5e871 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -119,9 +119,7 @@ @Override public ReturnDTO deleteCertificate(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCertificateMapper.update(null, updateWrapper)>0){ + if(meterCertificateMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java index d4bfc9e..f574719 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java @@ -51,9 +51,7 @@ @Override public ReturnDTO deleteCheckInfo(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterCheckInfoMapper.update(null, updateWrapper)>0){ + if(meterCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 18976c1..6362888 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; @Service("MeterEquipmentApplyService") @@ -53,8 +54,8 @@ public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ MeterEquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); DictCodeUtils.convertDictCodeToName(equipmentApply); - List equipmentList = equipmentMapper.queryEquipmentList(idDTO.getId()); - equipmentApply.setEquipmentList(equipmentList); + List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); + equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; } @@ -87,9 +88,7 @@ @Override public ReturnDTO deleteEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(equipmentApplyMapper.update(null, updateWrapper)>0){ + if(equipmentApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -99,6 +98,13 @@ public ReturnDTO updateEquipmentApply(MeterEquipmentApply meterEquipmentApply) { int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply); if(updateFlg>0){ + List ids = new ArrayList<>(); + for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) { + if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ + ids.add(applyEquipment.getId()); + } + } + equipmentMapper.deleteBatchIds(ids); boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 4fd8940..b0e7338 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -63,9 +63,7 @@ @Override public ReturnDTO deletePrice(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterPriceMapper.update(null, updateWrapper)>0){ + if(meterPriceMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -90,8 +88,7 @@ @Override public ReturnDTO updatePriceInfo(MeterPrice meterPrice) { int updateFlag = meterPriceMapper.updateById(meterPrice); - boolean saveOrUpdateFlag = meterHistoricalPriceService.saveOrUpdateBatch(meterPrice.getHistoricalPriceList()); - if(saveOrUpdateFlag && updateFlag>0){ + if(updateFlag>0){ return ReturnUtil.success(); } return ReturnUtil.failed("价格信息编辑失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 1672984..c20594a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -103,9 +103,7 @@ @Override public ReturnDTO deleteStaff(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterStaffMapper.update(null, updateWrapper)>0){ + if(meterStaffMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java index 9ff90e4..a579961 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java @@ -73,7 +73,7 @@ public Object standardEquipmentApplyInfo(IdDTO idDTO) throws Exception { // 通过id获取申请记录 MeterStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId()); - // 通过申请记录 + // 通过申请标准装置id获取标准装置详细信息 MeterStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId()); DictCodeUtils.convertDictCodeToName(standardEquipment); result.setMeterStandardEquipment(standardEquipment); @@ -122,9 +122,7 @@ @Override public ReturnDTO deleteStandardEquipmentApply(IdDTO idDto) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("is_del", 1); - if(meterStandardApplyMapper.update(null, updateWrapper)>0){ + if(meterStandardApplyMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index 3f05f67..7e4b26f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -109,7 +109,7 @@ // variables.put("pay", purchase.getPay()); // variables.put("manager", purchase.getManager()); // variables.put("money", Double.parseDouble(purchase.getTotal())); -// //流程实例关联业务表主键 +// //- // runtimeService.startProcessInstanceByKey("purchase", String.valueOf(meterFile.getId()), variables); return ReturnUtil.success(); }