diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 23a7aed..ac89c0e 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -20,7 +20,7 @@ LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{id} @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml index 23a7aed..ac89c0e 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml @@ -20,7 +20,7 @@ LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{id} @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } 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 82cae83..df07d39 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 @@ -159,6 +159,7 @@ MeterStaff meterStaff = meterStaffMapper.selectById(meterCertificate.getStaffId()); MeterCertificateExpireMessage message = new MeterCertificateExpireMessage(null,meterCertificate.getStaffId(),String.valueOf(meterCertificate.getId()),meterStaff.getAccount(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),meterCertificate.getValidDate(),0); if(messageMapper.insert(message)>0){ + // todo 新增到消息列表后向用户推送消息 return ReturnUtil.success(); } return ReturnUtil.failed("提醒失败"); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } 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 82cae83..df07d39 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 @@ -159,6 +159,7 @@ MeterStaff meterStaff = meterStaffMapper.selectById(meterCertificate.getStaffId()); MeterCertificateExpireMessage message = new MeterCertificateExpireMessage(null,meterCertificate.getStaffId(),String.valueOf(meterCertificate.getId()),meterStaff.getAccount(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),meterCertificate.getValidDate(),0); if(messageMapper.insert(message)>0){ + // todo 新增到消息列表后向用户推送消息 return ReturnUtil.success(); } return ReturnUtil.failed("提醒失败"); 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 48096c1..c1b40a2 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 @@ -87,16 +87,19 @@ meterPrice.setPriceItem(item.getId().toString()); if(meterPriceMapper.insert(meterPrice)>0){ return ReturnUtil.success(); - }else{ - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("价格库新增失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public MeterPrice selectStaffInfo(IdDTO idDto) { - return meterPriceMapper.selectById(String.valueOf(idDto.getId())); + MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); + meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); + meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); + return meterPrice; } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } 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 82cae83..df07d39 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 @@ -159,6 +159,7 @@ MeterStaff meterStaff = meterStaffMapper.selectById(meterCertificate.getStaffId()); MeterCertificateExpireMessage message = new MeterCertificateExpireMessage(null,meterCertificate.getStaffId(),String.valueOf(meterCertificate.getId()),meterStaff.getAccount(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),meterCertificate.getValidDate(),0); if(messageMapper.insert(message)>0){ + // todo 新增到消息列表后向用户推送消息 return ReturnUtil.success(); } return ReturnUtil.failed("提醒失败"); 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 48096c1..c1b40a2 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 @@ -87,16 +87,19 @@ meterPrice.setPriceItem(item.getId().toString()); if(meterPriceMapper.insert(meterPrice)>0){ return ReturnUtil.success(); - }else{ - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("价格库新增失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public MeterPrice selectStaffInfo(IdDTO idDto) { - return meterPriceMapper.selectById(String.valueOf(idDto.getId())); + MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); + meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); + meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); + return meterPrice; } @Override 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 664d965..60f4a31 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 @@ -294,6 +294,7 @@ } + public static boolean isDateFormat(String date) { if (StringUtils.isBlank(date)) { return false; @@ -317,4 +318,9 @@ return meterStaffList; } + @Override + public List selectStaffListByDept(MeterStaffRequest meterStaffRequest) { + return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } 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 82cae83..df07d39 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 @@ -159,6 +159,7 @@ MeterStaff meterStaff = meterStaffMapper.selectById(meterCertificate.getStaffId()); MeterCertificateExpireMessage message = new MeterCertificateExpireMessage(null,meterCertificate.getStaffId(),String.valueOf(meterCertificate.getId()),meterStaff.getAccount(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),meterCertificate.getValidDate(),0); if(messageMapper.insert(message)>0){ + // todo 新增到消息列表后向用户推送消息 return ReturnUtil.success(); } return ReturnUtil.failed("提醒失败"); 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 48096c1..c1b40a2 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 @@ -87,16 +87,19 @@ meterPrice.setPriceItem(item.getId().toString()); if(meterPriceMapper.insert(meterPrice)>0){ return ReturnUtil.success(); - }else{ - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("价格库新增失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public MeterPrice selectStaffInfo(IdDTO idDto) { - return meterPriceMapper.selectById(String.valueOf(idDto.getId())); + MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); + meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); + meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); + return meterPrice; } @Override 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 664d965..60f4a31 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 @@ -294,6 +294,7 @@ } + public static boolean isDateFormat(String date) { if (StringUtils.isBlank(date)) { return false; @@ -317,4 +318,9 @@ return meterStaffList; } + @Override + public List selectStaffListByDept(MeterStaffRequest meterStaffRequest) { + return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java index f10f4c8..00559ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java @@ -38,4 +38,6 @@ ReturnDTO addFixedAssetList(List meterFixedAssetsList) throws Exception; EquipmentFixedAssets getById(Long id) throws Exception; + + ReturnDTO queryListByDept(Long id) throws Exception; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 375c4b0..3a664b4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -199,4 +199,14 @@ return iEquipmentFixedAssetsService.querySelectList(); } + /** + * 根据使用部门查询测量设备 + */ + @ApiOperation("根据使用部门查询测量设备") + @PostMapping("/queryListByDept") + @ResponseBody + public ReturnDTO queryListByDept(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java index d82f88d..de24de6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardSupportEquipmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-标准配套设备表") @RequestMapping("/meter/standard/equipment") public class EquipmentStandardSupportEquipmentController extends ExportController { /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java index c5d5ed6..2abc74b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardVerifyRegulationController.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation; import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ * @since 2022-12-15 */ @RestController +@Api(tags = "标准装置-检定规程表") @RequestMapping("/meter/standard/regulation") public class EquipmentStandardVerifyRegulationController extends ExportController { @Autowired diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index f717e91..9c43740 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -139,4 +139,16 @@ return ReturnUtil.failed("数据取失败"); } } + + /** + * 通过部门查询人员列表 + * @return + */ + @ApiOperation("通过部门查询人员列表") + @PostMapping("/selectStaffListByDept") + @ResponseBody + public ReturnDTO selectStaffListByDept(@RequestBody MeterStaffRequest meterStaffRequest) { + List list = meterStaffService.selectStaffListByDept(meterStaffRequest); + return ReturnUtil.success(list); + } } 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 d0ff2d4..1650d41 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 @@ -18,4 +18,6 @@ Page queryPriceList(Page page, @Param("request") MeterPriceRequest meterPriceRequest); List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); + + MeterPrice selectStaffInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 204d05f..658a8c3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -22,8 +22,7 @@ equipment_apply ea LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id WHERE - 1 = 1 - AND ea.is_del = 0 + ea.is_del = 0 @@ -32,7 +32,7 @@ FROM equipment_apply_equipment msae LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id - where 1=1 and msae.is_del != 1 + where msae.is_del = 0 and msae.apply_id = #{acceptanceCheckId} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 4acdce0..8c5b022 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -24,7 +24,7 @@ equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1136f79..25ca988 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -21,7 +21,7 @@ LEFT JOIN sys_dept sd on sd.id = mfa.use_dept LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 - WHERE 1=1 and mfa.is_del != 1 + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index c396e64..0b88955 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN sys_user su1 ON su1.id = msa.create_user LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 and msa.apply_no like concat('%', #{request.applyNo}, '%') @@ -38,7 +38,7 @@ and mse.standard_no like concat('%', #{request.standardNo}, '%') - + and mse.standard_name like concat('%', #{request.standardName}, '%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index a544bd4..15b4613 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -54,8 +54,7 @@ LEFT JOIN meter_staff ms ON ms.id = mse.standard_owner LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory WHERE - 1 = 1 - AND mse.is_del != 1 + mse.is_del = 0 ORDER BY mse.create_time DESC @@ -67,7 +66,7 @@ FROM equipment_standard_equipment mse LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory - WHERE 1=1 and mse.is_del != 1 + WHERE mse.is_del = 0 and CURRENT_TIMESTAMP >= mse.remind_time diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 1518a22..8baf835 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -19,6 +19,11 @@ sd.SIMPLE_NAME as apply_unit, su.`NAME` as apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, + mfa.equipment_specifications, + mfa.manufacturing_no, + mfa.manufacturer, + meae.financial_value, + meae.asset_origin_value, msa.process_id, msa.process_result, msa.remark @@ -28,7 +33,7 @@ LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id LEFT JOIN equipment_fixed_assets mfa on meae.equipment_id = mfa.id - where 1=1 and msa.is_del = 0 + where msa.is_del = 0 @@ -63,8 +63,7 @@ equipment_apply_equipment eae LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} and eae.apply_id in @@ -82,8 +81,7 @@ LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id LEFT JOIN equipment_fixed_assets efa ON eae.equipment_id = efa.id WHERE - 1 = 1 - AND eae.equipment_id IS NOT NULL + eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} 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 2765a80..2bcd703 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -6,7 +6,7 @@ SELECT IFNULL(max(RIGHT(price_no, 12)), 0) from meter_price - + - 1 = 1 + mp.is_del = 0 and mp.price_no like CONCAT('%',#{request.priceNo},'%') @@ -59,6 +65,11 @@ + + INSERT INTO meter_price ( `id`, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index 0627f5b..f416437 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -49,7 +49,7 @@ */ @NotBlank(message = "申请类型不能为空") @ApiModelProperty(value = "申请类型-字典code", dataType = "String") - @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.STANDARD_APPLY_TYPE) + @DictCodeField(message = "申请类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_TYPE) private String applyType; /** @@ -110,17 +110,29 @@ * 申请单位 */ @ApiModelProperty(value = "申请单位", dataType = "String") - @ExcelProperty(value = "申请单位",order = 6) private String applyUnit; /** + * 申请单位名称 + */ + @ApiModelProperty(value = "申请单位名称", dataType = "String") + @ExcelProperty(value = "申请单位",order = 6) + private String applyUnitName; + + /** * 申请人 */ @ApiModelProperty(value = "申请人", dataType = "String") - @ExcelProperty(value = "申请人",order = 7) private String applyPerson; /** + * 申请人名称 + */ + @ApiModelProperty(value = "申请人名称", dataType = "String") + @ExcelProperty(value = "申请人",order = 7) + private String applyPersonName; + + /** * 申请时间 */ @ApiModelProperty(value = "申请时间", dataType = "String") @@ -128,6 +140,39 @@ private String time; /** + * 设备规格 + */ + @ExcelProperty("设备规格") + @ApiModelProperty(value = "设备规格", dataType = "String") + private String equipmentSpecifications; + + /** + * 出厂编号 + */ + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + + + /** + * 生产厂家 + */ + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + /** + * 财务净值 + */ + @ApiModelProperty(value = "财务净值", dataType = "String") + private String financialValue; + + /** + * 资产原值 + */ + @ApiModelProperty(value = "资产原值", dataType = "String") + private String assetOriginValue; + + + /** * 流程实例ID */ @ApiModelProperty(value = "流程实例ID", dataType = "String") @@ -148,7 +193,7 @@ /** * 备注 */ - @ApiModelProperty(value = "备注", dataType = "String") + @ApiModelProperty(value = "申请理由", dataType = "String") private String remark; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java index 708e575..5c82398 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java @@ -30,7 +30,7 @@ /** *工作部门 */ - @ApiModelProperty(value = "工作部门", dataType = "String") + @ApiModelProperty(value = "组织部门", dataType = "String") private String deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java index 95598d5..7fdb748 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java @@ -104,7 +104,7 @@ @NotBlank(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") - private String standardOwner; + private Long standardOwner; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 709012d..6ca4564 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -65,9 +65,13 @@ @ApiModelProperty(value = "项目名称", dataType = "String") private String itemName; - @TableField("price_standard") + @TableField(exist = false) @ExcelProperty(value = "依据标准",order = 9) @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") + private String priceStandardName; + + @TableField("price_standard") + @ApiModelProperty(value = "依据标准-计量规程文件名", dataType = "String") private String priceStandard; @TableField("price_limit") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index d3fa36f..ed85ad4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -210,6 +210,7 @@ return meterFixedAssets; } + /** * 删除资产 * @@ -288,6 +289,19 @@ return ReturnUtil.success(this.baseMapper.selectList(wrapper)); } + + @Override + public ReturnDTO queryListByDept(Long id) throws Exception { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("asset_type", MeterDictEnum.ASSET_TYPE_1); + wrapper.eq("use_dept", id); + List equipmentFixedAssets = this.baseMapper.selectList(wrapper); + for (EquipmentFixedAssets meterFixedAssets : equipmentFixedAssets) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return ReturnUtil.success(equipmentFixedAssets); + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index 673fbd6..caa63a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -208,6 +208,7 @@ */ @Override public ReturnDTO remind(Long id) { + // todo 依赖质量管理里的溯源的证书管理，需要完善 return updateRemindTime(id,new Date()); } 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 82cae83..df07d39 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 @@ -159,6 +159,7 @@ MeterStaff meterStaff = meterStaffMapper.selectById(meterCertificate.getStaffId()); MeterCertificateExpireMessage message = new MeterCertificateExpireMessage(null,meterCertificate.getStaffId(),String.valueOf(meterCertificate.getId()),meterStaff.getAccount(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),meterCertificate.getValidDate(),0); if(messageMapper.insert(message)>0){ + // todo 新增到消息列表后向用户推送消息 return ReturnUtil.success(); } return ReturnUtil.failed("提醒失败"); 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 48096c1..c1b40a2 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 @@ -87,16 +87,19 @@ meterPrice.setPriceItem(item.getId().toString()); if(meterPriceMapper.insert(meterPrice)>0){ return ReturnUtil.success(); - }else{ - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("价格库新增失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public MeterPrice selectStaffInfo(IdDTO idDto) { - return meterPriceMapper.selectById(String.valueOf(idDto.getId())); + MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); + meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); + meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); + return meterPrice; } @Override 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 664d965..60f4a31 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 @@ -294,6 +294,7 @@ } + public static boolean isDateFormat(String date) { if (StringUtils.isBlank(date)) { return false; @@ -317,4 +318,9 @@ return meterStaffList; } + @Override + public List selectStaffListByDept(MeterStaffRequest meterStaffRequest) { + return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java index f10f4c8..00559ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java @@ -38,4 +38,6 @@ ReturnDTO addFixedAssetList(List meterFixedAssetsList) throws Exception; EquipmentFixedAssets getById(Long id) throws Exception; + + ReturnDTO queryListByDept(Long id) throws Exception; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index c630322..6c4acc8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -36,4 +36,6 @@ ReturnDTO updateStaffInfo(MeterStaff meterStaff); ReturnDTO dataCheck(List list); + + List selectStaffListByDept(MeterStaffRequest meterStaffRequest); }