diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} 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 365624e..cfa9d92 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -45,9 +45,6 @@ and msa.apply_unit = #{request.applyUnit} - - and msa.approval_status = #{request.approvalStatus} - and msa.approval_status = #{request.applyStatus} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} 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 365624e..cfa9d92 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -45,9 +45,6 @@ and msa.apply_unit = #{request.applyUnit} - - and msa.approval_status = #{request.approvalStatus} - and msa.approval_status = #{request.applyStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java index c315073..1d5145f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java @@ -48,15 +48,23 @@ private String checkType; @TableField("price_type") - @ExcelProperty(value = "价格类别",order = 4) - @ApiModelProperty(value = "价格类别-字典value", dataType = "String") + @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + @TableField("price_item") - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目-字典value", dataType = "String") + @ApiModelProperty(value = "项目id", dataType = "String") private String priceItem; + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + @TableField("price_standard") @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} 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 365624e..cfa9d92 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -45,9 +45,6 @@ and msa.apply_unit = #{request.applyUnit} - - and msa.approval_status = #{request.approvalStatus} - and msa.approval_status = #{request.applyStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java index c315073..1d5145f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java @@ -48,15 +48,23 @@ private String checkType; @TableField("price_type") - @ExcelProperty(value = "价格类别",order = 4) - @ApiModelProperty(value = "价格类别-字典value", dataType = "String") + @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + @TableField("price_item") - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目-字典value", dataType = "String") + @ApiModelProperty(value = "项目id", dataType = "String") private String priceItem; + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + @TableField("price_standard") @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java new file mode 100644 index 0000000..d05557b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} 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 365624e..cfa9d92 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -45,9 +45,6 @@ and msa.apply_unit = #{request.applyUnit} - - and msa.approval_status = #{request.approvalStatus} - and msa.approval_status = #{request.applyStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java index c315073..1d5145f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java @@ -48,15 +48,23 @@ private String checkType; @TableField("price_type") - @ExcelProperty(value = "价格类别",order = 4) - @ApiModelProperty(value = "价格类别-字典value", dataType = "String") + @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + @TableField("price_item") - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目-字典value", dataType = "String") + @ApiModelProperty(value = "项目id", dataType = "String") private String priceItem; + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + @TableField("price_standard") @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java new file mode 100644 index 0000000..d05557b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java new file mode 100644 index 0000000..e59ff2f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index 6e2f38e..a58e905 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -34,7 +34,7 @@ /** **

- * * 测量设备-设备借用申请 + * * 测量设备-设备借用/领用申请 * *

* * @author xiezhuangz @@ -43,7 +43,7 @@ */ @Slf4j -@Api(tags = "设备借用申请相关接口") +@Api(tags = "设备借用/领用申请相关接口") @RestController @RequestMapping("/equipmentApply") public class MeterEquipmentApplyController extends ExportController { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java new file mode 100644 index 0000000..f183636 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceCategoryMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceCategory; + +public interface MeterPriceCategoryMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java new file mode 100644 index 0000000..c19c012 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceItemMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterPriceItem; + +public interface MeterPriceItemMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index a0348fa..7a15b78 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -1,8 +1,11 @@ package com.casic.missiles.mapper.meter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterPriceImport; +import com.casic.missiles.dto.meter.MeterPriceRequest; import com.casic.missiles.model.MeterPrice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +14,8 @@ Long getMaxNo(); void addMeterPriceList(List list); + + Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); + + List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); } 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 caf811c..e43323a 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml @@ -46,9 +46,6 @@ and DATE_FORMAT( msa.time, '%Y-%m-%d' ) <= #{request.endTime} - - and msa.approval_status = #{request.approvalStatus} - and msa.process_result = #{request.processResult} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 196b28c..eba1516 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,6 +6,59 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index efe12ae..668e855 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -49,6 +49,7 @@ FROM meter_staff t where t.is_del = 0) t2 + 1 = 1 and t2.staff_no like CONCAT('%',#{request.staffNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index 5b7bde6..0b990ac 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -44,9 +44,6 @@ and su1.dept_id = #{request.organizeNo} - - and msa.approval_status = #{request.approvalStatus} - and msa.apply_type = #{request.applyType} 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 365624e..cfa9d92 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -45,9 +45,6 @@ and msa.apply_unit = #{request.applyUnit} - - and msa.approval_status = #{request.approvalStatus} - and msa.approval_status = #{request.applyStatus} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java index c315073..1d5145f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPrice.java @@ -48,15 +48,23 @@ private String checkType; @TableField("price_type") - @ExcelProperty(value = "价格类别",order = 4) - @ApiModelProperty(value = "价格类别-字典value", dataType = "String") + @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; + @TableField(exist = false) + @ExcelProperty(value = "类别",order = 4) + @ApiModelProperty(value = "类别名称", dataType = "String") + private String categoryName; + @TableField("price_item") - @ExcelProperty(value = "项目",order = 5) - @ApiModelProperty(value = "项目-字典value", dataType = "String") + @ApiModelProperty(value = "项目id", dataType = "String") private String priceItem; + @TableField(exist = false) + @ExcelProperty(value = "项目",order = 5) + @ApiModelProperty(value = "项目名称", dataType = "String") + private String itemName; + @TableField("price_standard") @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java new file mode 100644 index 0000000..d05557b --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceCategory.java @@ -0,0 +1,78 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_category") +public class MeterPriceCategory implements Serializable { + + private static final long serialVersionUID = 3734458833527172572L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 校验类型-字典code + */ + @TableField("check_type_code") + @ApiModelProperty(value = "校验类型-字典code", dataType = "String") + private String checkTypeCode; + + /** + * 类别名称 + */ + @ApiModelProperty(value = "类别名称", dataType = "String") + @TableField("category_name") + private String categoryName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceCategory(Long id ,String checkTypeCode, String categoryName) { + this.id = id; + this.checkTypeCode = checkTypeCode; + this.categoryName = categoryName; + } + + public MeterPriceCategory() { + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java new file mode 100644 index 0000000..e59ff2f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterPriceItem.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel +@TableName("meter_price_item") +public class MeterPriceItem implements Serializable { + + private static final long serialVersionUID = 8885247047683107748L; + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + /** + * 类别id + */ + @TableField("category_id") + @ApiModelProperty(value = "类别id", dataType = "String") + private Long categoryId; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称", dataType = "String") + @TableField("item_name") + private String itemName; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + public MeterPriceItem(Long id,Long categoryId, String itemName) { + this.id = id; + this.categoryId = categoryId; + this.itemName = itemName; + } + +} 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 315bace..0fc9b4b 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 @@ -16,6 +16,8 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.MeterDictEnum; +import com.casic.missiles.mapper.meter.MeterPriceCategoryMapper; +import com.casic.missiles.mapper.meter.MeterPriceItemMapper; import com.casic.missiles.mapper.meter.MeterPriceMapper; import com.casic.missiles.model.*; import com.casic.missiles.modular.system.model.Dict; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; @@ -44,21 +47,23 @@ private MeterPriceMapper meterPriceMapper; @Resource + private MeterPriceCategoryMapper meterPriceCategoryMapper; + + @Resource + private MeterPriceItemMapper meterPriceItemMapper; + + @Resource private MinioUtil minioUtil; @Resource private AbstractDictService dictService; @Resource - private MeterPriceService meterPriceService; - - @Resource private IBaseExportService iBaseExportService; @Override public Page queryPriceList(Page page, MeterPriceRequest meterPriceRequest) { - QueryWrapper wrapper = getQueryWrapper(meterPriceRequest); - Page meterPricePage = meterPriceMapper.selectPage(page, wrapper); + Page meterPricePage = meterPriceMapper.queryPriceList(page, meterPriceRequest); meterPricePage.setRecords(supplementList(meterPricePage.getRecords())); return meterPricePage; } @@ -73,11 +78,20 @@ @Override public ReturnDTO addMeterPrice(MeterPrice meterPrice) { - Long maxNo = meterPriceMapper.getMaxNo(); - String priceNo = NumberGeneratorUtil.getContactNo("jg", maxNo); - meterPrice.setPriceNo(priceNo); - if(meterPriceMapper.insert(meterPrice)>0){ - return ReturnUtil.success(); + MeterPriceCategory priceCategory = new MeterPriceCategory(null,meterPrice.getCheckType(),meterPrice.getCategoryName()); + int categoryFlag = meterPriceCategoryMapper.insert(priceCategory); + MeterPriceItem item = new MeterPriceItem(null,priceCategory.getId(),meterPrice.getItemName()); + if(categoryFlag>0 && meterPriceItemMapper.insert(item)>0){ + Long maxNo = meterPriceMapper.getMaxNo(); + String priceNo = NumberGeneratorUtil.getContactNo("jg", maxNo); + meterPrice.setPriceNo(priceNo); + meterPrice.setPriceType(priceCategory.getId().toString()); + meterPrice.setPriceItem(item.getId().toString()); + if(meterPriceMapper.insert(meterPrice)>0){ + return ReturnUtil.success(); + }else{ + return ReturnUtil.failed("操作失败"); + } } return ReturnUtil.failed("价格库新增失败"); } @@ -90,7 +104,11 @@ @Override public ReturnDTO updatePriceInfo(MeterPrice meterPrice) { int updateFlag = meterPriceMapper.updateById(meterPrice); - if(updateFlag>0){ + MeterPriceCategory priceCategory = new MeterPriceCategory(Long.parseLong(meterPrice.getPriceType()),meterPrice.getCheckType(),meterPrice.getCategoryName()); + int categoryFlag = meterPriceCategoryMapper.updateById(priceCategory); + MeterPriceItem item = new MeterPriceItem(Long.parseLong(meterPrice.getPriceItem()),priceCategory.getId(),meterPrice.getItemName()); + int itemFlag = meterPriceItemMapper.updateById(item); + if(categoryFlag>0 && itemFlag>0 && updateFlag>0){ return ReturnUtil.success(); } return ReturnUtil.failed("价格信息编辑失败"); @@ -101,10 +119,11 @@ try { List meterPrices; if(!CollectionUtils.isEmpty(meterPriceRequest.getIds())){ - meterPrices = meterPriceService.listByIds(meterPriceRequest.getIds()); + MeterPriceRequest request = new MeterPriceRequest(); + request.setIds(meterPriceRequest.getIds()); + meterPrices = meterPriceMapper.queryPriceList(request); }else{ - QueryWrapper wrapper = getQueryWrapper(meterPriceRequest); - meterPrices = supplementList(meterPriceMapper.selectList(wrapper)); + meterPrices = supplementList(meterPriceMapper.queryPriceList(meterPriceRequest)); } iBaseExportService.exportExcel(response,MeterPrice.class,meterPrices, ExportEnum.METER_PRICE.getSheetName()); } catch (Exception e) { @@ -181,23 +200,10 @@ } - private QueryWrapper getQueryWrapper(MeterPriceRequest meterPriceRequest){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(meterPriceRequest.getPriceNo()), "price_no", meterPriceRequest.getPriceNo()); - wrapper.like(StringUtils.isNotBlank(meterPriceRequest.getPriceName()), "price_name", meterPriceRequest.getPriceName()); - wrapper.eq(StringUtils.isNotBlank(meterPriceRequest.getCheckType()), "check_type", meterPriceRequest.getCheckType()); - wrapper.like(StringUtils.isNotBlank(meterPriceRequest.getModel()), "model", meterPriceRequest.getModel()); - wrapper.eq(StringUtils.isNotBlank(meterPriceRequest.getPriceType()), "price_type", meterPriceRequest.getPriceType()); - wrapper.eq(StringUtils.isNotBlank(meterPriceRequest.getPriceItem()), "price_item", meterPriceRequest.getPriceItem()); - wrapper.eq("is_del", 0); - wrapper.orderByDesc("create_time"); - return wrapper; - } + private List supplementList(List meterPriceList){ meterPriceList.forEach(bean->{ bean.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType())); - bean.setPriceType(dictService.getDictNameByCode(MeterDictEnum.PRICE_TYPE,bean.getPriceType())); - bean.setPriceItem(dictService.getDictNameByCode(MeterDictEnum.PRICE_ITEM,bean.getPriceItem())); bean.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission())); bean.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission())); });