diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java index c41ef68..4e84eaa 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java @@ -59,4 +59,10 @@ return exceptionHandleService.detail(idDTO.getId()); } + @ApiOperation("设备故障情况及维修情况拼接列表(编号+异常情况描述原因及后果分析+设备处置结果 共同拼接而成，如有多条用分号隔开)") + @PostMapping("/faultSituation") + public ReturnDTO> faultSituation(@RequestBody @Valid IdDTO idDTO) { + return exceptionHandleService.faultSituation(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java index c41ef68..4e84eaa 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java @@ -59,4 +59,10 @@ return exceptionHandleService.detail(idDTO.getId()); } + @ApiOperation("设备故障情况及维修情况拼接列表(编号+异常情况描述原因及后果分析+设备处置结果 共同拼接而成，如有多条用分号隔开)") + @PostMapping("/faultSituation") + public ReturnDTO> faultSituation(@RequestBody @Valid IdDTO idDTO) { + return exceptionHandleService.faultSituation(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java index b72a6cd..2ef6a9f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.util.List; /** *

@@ -54,10 +53,4 @@ return evaluateService.detail(idDTO.getId()); } - @ApiOperation("设备故障情况及维修情况拼接列表(编号+异常情况描述原因及后果分析+设备处置结果 共同拼接而成，如有多条用分号隔开)") - @PostMapping("/faultSituation") - public ReturnDTO> faultSituation(@RequestBody @Valid IdDTO idDTO) { - return exceptionHandleService.faultSituation(idDTO.getId()); - } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java index c41ef68..4e84eaa 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentExceptionHandleController.java @@ -59,4 +59,10 @@ return exceptionHandleService.detail(idDTO.getId()); } + @ApiOperation("设备故障情况及维修情况拼接列表(编号+异常情况描述原因及后果分析+设备处置结果 共同拼接而成，如有多条用分号隔开)") + @PostMapping("/faultSituation") + public ReturnDTO> faultSituation(@RequestBody @Valid IdDTO idDTO) { + return exceptionHandleService.faultSituation(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java index b72a6cd..2ef6a9f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSupplierEvaluateController.java @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.util.List; /** *

@@ -54,10 +53,4 @@ return evaluateService.detail(idDTO.getId()); } - @ApiOperation("设备故障情况及维修情况拼接列表(编号+异常情况描述原因及后果分析+设备处置结果 共同拼接而成，如有多条用分号隔开)") - @PostMapping("/faultSituation") - public ReturnDTO> faultSituation(@RequestBody @Valid IdDTO idDTO) { - return exceptionHandleService.faultSituation(idDTO.getId()); - } - } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierConsumableGoodsApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierConsumableGoodsApplyMapper.xml index 0dfee5b..1caed8e 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierConsumableGoodsApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierConsumableGoodsApplyMapper.xml @@ -27,46 +27,49 @@ - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_goods_warehouse + SELECT brsgw.*, GROUP_CONCAT(brsgwd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brsgwd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brsgwd.amount SEPARATOR ',') AS amount + FROM biz_resource_supplier_goods_warehouse brsgw + LEFT JOIN biz_resource_supplier_goods_warehouse_detail brsgwd ON brsgw.id = brsgwd.warehouse_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brsgw.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brsgw.create_user_id = #{request.createUserId} - and warehouse_no like concat('%',#{request.warehouseNo},'%') + and brsgw.warehouse_no like concat('%',#{request.warehouseNo},'%') - and warehouse_name like concat('%',#{request.warehouseName},'%') + and brsgw.warehouse_name like concat('%',#{request.warehouseName},'%') - and create_time >= #{request.createTimeStart} + and brsgw.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brsgw.create_time <= #{request.createTimeEnd} - and id in + and brsgw.id in #{id} - ORDER BY create_time DESC + GROUP BY brsgw.id + ORDER BY brsgw.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_goods_warehouse + SELECT brsgw.*, GROUP_CONCAT(brsgwd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brsgwd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brsgwd.amount SEPARATOR ',') AS amount + FROM biz_resource_supplier_goods_warehouse brsgw + LEFT JOIN biz_resource_supplier_goods_warehouse_detail brsgwd ON brsgw.id = brsgwd.warehouse_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brsgw.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brsgw.create_user_id = #{request.createUserId} - and warehouse_no like concat('%',#{request.warehouseNo},'%') + and brsgw.warehouse_no like concat('%',#{request.warehouseNo},'%') - and warehouse_name like concat('%',#{request.warehouseName},'%') + and brsgw.warehouse_name like concat('%',#{request.warehouseName},'%') - and create_time >= #{request.createTimeStart} + and brsgw.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brsgw.create_time <= #{request.createTimeEnd} - and id in + and brsgw.id in #{id} - ORDER BY create_time DESC + GROUP BY brsgw.id + ORDER BY brsgw.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_goods_warehouse + SELECT brsgw.*, GROUP_CONCAT(brsgwd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brsgwd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brsgwd.amount SEPARATOR ',') AS amount + FROM biz_resource_supplier_goods_warehouse brsgw + LEFT JOIN biz_resource_supplier_goods_warehouse_detail brsgwd ON brsgw.id = brsgwd.warehouse_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brsgw.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brsgw.create_user_id = #{request.createUserId} - and warehouse_no like concat('%',#{request.warehouseNo},'%') + and brsgw.warehouse_no like concat('%',#{request.warehouseNo},'%') - and warehouse_name like concat('%',#{request.warehouseName},'%') + and brsgw.warehouse_name like concat('%',#{request.warehouseName},'%') - and create_time >= #{request.createTimeStart} + and brsgw.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brsgw.create_time <= #{request.createTimeEnd} - and id in + and brsgw.id in #{id} - ORDER BY create_time DESC + GROUP BY brsgw.id + ORDER BY brsgw.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_goods_warehouse + SELECT brsgw.*, GROUP_CONCAT(brsgwd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brsgwd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brsgwd.amount SEPARATOR ',') AS amount + FROM biz_resource_supplier_goods_warehouse brsgw + LEFT JOIN biz_resource_supplier_goods_warehouse_detail brsgwd ON brsgw.id = brsgwd.warehouse_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brsgw.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brsgw.create_user_id = #{request.createUserId} - and warehouse_no like concat('%',#{request.warehouseNo},'%') + and brsgw.warehouse_no like concat('%',#{request.warehouseNo},'%') - and warehouse_name like concat('%',#{request.warehouseName},'%') + and brsgw.warehouse_name like concat('%',#{request.warehouseName},'%') - and create_time >= #{request.createTimeStart} + and brsgw.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brsgw.create_time <= #{request.createTimeEnd} - and id in + and brsgw.id in #{id} - ORDER BY create_time DESC + GROUP BY brsgw.id + ORDER BY brsgw.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_apply + SELECT brscga.*, GROUP_CONCAT(brscgd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brscgd.goods_quantity SEPARATOR ',') AS goodsQuantity + FROM biz_resource_supplier_consumable_goods_apply brscga + LEFT JOIN biz_resource_supplier_consumable_goods_detail brscgd ON brscga.id = brscgd.apply_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscga.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and apply_no like concat('%',#{request.applyNo},'%') + and brscga.apply_no like concat('%',#{request.applyNo},'%') - and apply_name like concat('%',#{request.applyName},'%') + and brscga.apply_name like concat('%',#{request.applyName},'%') - and create_user_id = #{request.createUserId} + and brscga.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscga.create_user_name like concat('%',#{request.createUserName},'%') - and create_dept_id = #{request.createDeptId} + and brscga.create_dept_id = #{request.createDeptId} - and create_dept like concat('%',#{request.createDept},'%') + and brscga.create_dept like concat('%',#{request.createDept},'%') - and create_time >= #{request.createTimeStart} + and brscga.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscga.create_time <= #{request.createTimeEnd} - and id in + and brscga.id in #{id} - ORDER BY create_time DESC + GROUP BY brscga.id + ORDER BY brscga.create_time DESC - SELECT * - FROM biz_resource_supplier_consumable_goods_use + SELECT brscgu.*, GROUP_CONCAT(brscgud.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brscgud.use_time SEPARATOR ',') AS useTime, + GROUP_CONCAT(brscgud.use_amount SEPARATOR ',') AS useAmount + FROM biz_resource_supplier_consumable_goods_use brscgu + LEFT JOIN biz_resource_supplier_consumable_goods_use_detail brscgud ON brscgu.id = brscgud.record_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brscgu.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and record_no like concat('%',#{request.recordNo},'%') + and brscgu.record_no like concat('%',#{request.recordNo},'%') - and record_name like concat('%',#{request.recordName},'%') + and brscgu.record_name like concat('%',#{request.recordName},'%') - and create_user_id = #{request.createUserId} + and brscgu.create_user_id = #{request.createUserId} - and create_user_name like concat('%',#{request.createUserName},'%') + and brscgu.create_user_name like concat('%',#{request.createUserName},'%') - and create_time >= #{request.createTimeStart} + and brscgu.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brscgu.create_time <= #{request.createTimeEnd} - and id in + and brscgu.id in #{id} - ORDER BY create_time DESC + GROUP BY brscgu.id + ORDER BY brscgu.create_time DESC - SELECT * - FROM biz_resource_supplier_goods_warehouse + SELECT brsgw.*, GROUP_CONCAT(brsgwd.goods_name SEPARATOR ',') AS goodsName, GROUP_CONCAT(brsgwd.goods_model SEPARATOR ',') AS goodsModel, + GROUP_CONCAT(brsgwd.amount SEPARATOR ',') AS amount + FROM biz_resource_supplier_goods_warehouse brsgw + LEFT JOIN biz_resource_supplier_goods_warehouse_detail brsgwd ON brsgw.id = brsgwd.warehouse_id WHERE 1=1 - and approval_status = #{request.approvalStatus} + and brsgw.approval_status = #{request.approvalStatus} - and create_user_id = #{request.createUserId} + and brsgw.create_user_id = #{request.createUserId} - and warehouse_no like concat('%',#{request.warehouseNo},'%') + and brsgw.warehouse_no like concat('%',#{request.warehouseNo},'%') - and warehouse_name like concat('%',#{request.warehouseName},'%') + and brsgw.warehouse_name like concat('%',#{request.warehouseName},'%') - and create_time >= #{request.createTimeStart} + and brsgw.create_time >= #{request.createTimeStart} - and create_time <= #{request.createTimeEnd} + and brsgw.create_time <= #{request.createTimeEnd} - and id in + and brsgw.id in #{id} - ORDER BY create_time DESC + GROUP BY brsgw.id + ORDER BY brsgw.create_time DESC