yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

This commit is contained in:
1378012178@qq.com 2025-03-26 15:38:19 +08:00
parent 9a7761dd12 1d876fc4a3
commit 19234e5ada
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
View File

@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("config_material_category")
@TableName("nu_config_material_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="config_material_category对象", description="物料类别")

18
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java
View File

@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("config_material_info")
@TableName("nu_config_material_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="config_material_info对象", description="物料信息")
@ -37,18 +37,18 @@ public class ConfigMaterialInfo implements Serializable {
@ApiModelProperty(value = "id")
private java.lang.String id;
/**物料类别*/
@Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
@Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
@ApiModelProperty(value = "物料类别")
private java.lang.String categoryId;
/**物料类型*/
@Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
@Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "物料类型")
private java.lang.String typeId;
/**用药类型*/
@Excel(name = "用药类型", width = 15, dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id")
@Dict(dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id")
@Excel(name = "用药类型", width = 15, dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id")
@Dict(dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id")
@ApiModelProperty(value = "用药类型")
private java.lang.String medicationId;
/**货品名称*/
@ -108,9 +108,9 @@ public class ConfigMaterialInfo implements Serializable {
@ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级")
private java.lang.String multiUnitType;
/**供应商*/
@Excel(name = "供应商", width = 15,dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
@Excel(name = "供应商", width = 15,dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
@ApiModelProperty(value = "供应商")
@Dict(dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
@Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
private java.lang.String suppliers;
/**物料图片*/
@ApiModelProperty(value = "物料图片")

10
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java
View File

@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("config_material_medication")
@TableName("nu_config_material_medication")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="config_material_medication对象", description="物料用药类型")
@ -39,13 +39,13 @@ public class ConfigMaterialMedication implements Serializable {
@ApiModelProperty(value = "id")
private java.lang.String id;
/**物料类别*/
@Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id")
@Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id")
@ApiModelProperty(value = "物料类别")
private java.lang.String categoryId;
/**物料类型*/
@Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id")
@Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "物料类型")
private java.lang.String typeId;
/**名称*/

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java
View File

@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("config_material_type")
@TableName("nu_config_material_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="config_material_type对象", description="物料类型")
@ -39,9 +39,9 @@ public class ConfigMaterialType implements Serializable {
@ApiModelProperty(value = "id")
private java.lang.String id;
/**物料类别*/
@Excel(name = "物料类别", width = 15,dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id")
@Excel(name = "物料类别", width = 15,dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id")
@ApiModelProperty(value = "物料类别")
@Dict(dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id")
@Dict(dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id")
private java.lang.String categoryId;
/**物料类型*/
@Excel(name = "物料类型", width = 15)

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
View File

@ -13,9 +13,9 @@
a.id as category_id,
b.id as type_id,
c.id as medication_id
from config_material_category a
LEFT JOIN config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0
LEFT JOIN config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0
from nu_config_material_category a
LEFT JOIN nu_config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0
LEFT JOIN nu_config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0
where a.iz_enabled = 0 and a.del_flag = 0
order by a.sort asc,b.id asc,c.id asc ) a
${ew.customSqlSegment}

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
View File

@ -27,10 +27,10 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("config_suppliers_info")
@TableName("nu_config_suppliers_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="config_suppliers_info对象", description="供应商")
@ApiModel(value="nu_config_suppliers_info对象", description="供应商")
public class ConfigSuppliersInfo implements Serializable {
private static final long serialVersionUID = 1L;