From 9c38e80a8653de19481b2f5beda68c0965104078 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 6 May 2026 11:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterialInfoController.java | 1 - .../entity/ConfigMaterialInfo.java | 60 +--------- .../ConfigMaterialInfoImportEntity.java | 4 - .../ConfigMaterialTypeImportEntity.java | 4 - .../mapper/ConfigMaterialInfoMapper.java | 1 - .../mapper/xml/ConfigMaterialInfoMapper.xml | 12 -- .../service/IConfigMaterialInfoService.java | 1 - .../ConfigMaterialCategoryServiceImpl.java | 2 +- .../impl/ConfigMaterialInfoServiceImpl.java | 10 -- .../impl/NuInvoicingCgdMainServiceImpl.java | 27 ----- .../impl/ConfigSuppliersInfoServiceImpl.java | 7 -- .../qgd/service/impl/QgdInfoServiceImpl.java | 10 -- .../qld/service/impl/QingLingServiceImpl.java | 2 - .../thd/service/impl/ThdServiceImpl.java | 2 - .../xml/BlWarehouseMaterialInfoMapper.xml | 113 ++++++------------ .../camera/mapper/xml/CameraInfoMapper.xml | 3 +- .../modules/nubaseinfo/entity/NuBaseInfo.java | 8 -- .../service/impl/NuBaseInfoServiceImpl.java | 1 - 18 files changed, 44 insertions(+), 224 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java index d0df9f12..c2f34144 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java @@ -148,7 +148,6 @@ public class ConfigMaterialInfoController extends JeecgController ConfigMaterialInfo queryMaterialInfo(InvoicingQldQueryEntity queryDto); - void updateOneTwoPrice(@Param("params") ConfigMaterialInfo configMaterialInfo); List queryByWlids(@Param("ids") List ids); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index c1fad046..640b7c43 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -115,18 +115,6 @@ where info.id = #{wlId} - - - update nu_config_material_info - set one_unit = #{params.oneUnit}, - one_unit_proportion = #{params.oneUnitProportion}, - one_unit_price = #{params.oneUnitPrice}, - two_unit = #{params.twoUnit}, - two_unit_proportion = #{params.twoUnitProportion}, - two_unit_price = #{params.twoUnitPrice} - where id = #{params.id} - - select * from ( - select - a.*, - b.category_id, - b.type_id, - b.medication_id, - b.material_name, - b.pinyin, - b.material_no, - b.specification_model, - b.suppliers, - b.material_units, - b.multi_unit_switch, - b.one_unit, - b.one_unit_proportion, - b.one_unit_price, - b.two_unit, - b.two_unit_proportion, - b.two_unit_price, - b.multi_unit_type, - b.upper_limit, - b.lower_limit, - b.tag_type, - b.sales_unit_price, - b.reference_unit_price, - b.material_img, - c.item_text as tagName, - if(d.wl_id is null, '0', '1') as isAdd, - kf.nu_name - from nu_warehouse_material_info a - left join nu_config_material_info b on a.wl_id = b.id - left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id - left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698' - left join nu_base_info kf on kf.nu_id = a.nu_id + select + a.*, + b.category_id, + b.type_id, + b.medication_id, + b.material_name, + b.pinyin, + b.material_no, + b.specification_model, + b.material_img, + if(d.wl_id is null, '0', '1') as isAdd, + kf.nu_name + from nu_warehouse_material_info a + left join nu_config_material_info b on a.wl_id = b.id + left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id + left join nu_base_info kf on kf.nu_id = a.nu_id ) a ${ew.customSqlSegment} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index 47d2b3d2..3754c2b9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -313,7 +313,6 @@ a.id, a.nu_id, c.nu_name, - a.dimension, a.device_name, a.device_type, a.device_model, @@ -364,7 +363,7 @@ AND t.online_status = #{params.deviceStatus} - order by a.dimension,a.device_type,a.device_model,a.sn + order by a.device_type,a.device_model,a.sn diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index aff07196..8aea864e 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -123,11 +123,6 @@ public class NuBaseInfo implements Serializable { private java.lang.String sysOrgCode; @ApiModelProperty(value = "是否报警") private java.lang.String izWarning; - /** - * 是否已同步Y已同步 N未同步 - */ - @ApiModelProperty(value = "是否已同步Y已同步 N未同步") - private java.lang.String izSync; @ApiModelProperty(value = "负责人") @Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name") @@ -150,9 +145,6 @@ public class NuBaseInfo implements Serializable { * 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定） */ private String izBindPaying; - private String izHldy;//是否是护理单元 - private String izKf;//是否是库房 - @TableField(exist = false) private String deviceId;//摄像头 ID diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index 20457c3c..7b576f1d 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -108,7 +108,6 @@ public class NuBaseInfoServiceImpl extends ServiceImpl syncList) { syncList.stream().forEach(bi -> { - bi.setIzSync("0"); baseMapper.insert(bi); }); }