diff --git a/zhyc-admin/src/main/resources/application-druid.yml b/zhyc-admin/src/main/resources/application-druid.yml index 3c517de..2351abb 100644 --- a/zhyc-admin/src/main/resources/application-druid.yml +++ b/zhyc-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://localhost:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: 123456 +# url: jdbc:mysql://146.56.214.124:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: zhyc +# password: zhyc1234 url: jdbc:mysql://118.182.97.76:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: zhyc password: yszh123 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index 235fbac..af37c87 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -26,6 +26,7 @@ public class Deworm extends BaseEntity /** $column.columnComment */ private Long id; + private Long[] ids; private Long sheepId; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java index cffaa39..13a5417 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java @@ -26,9 +26,10 @@ public class Diagnosis extends BaseEntity /** $column.columnComment */ private Long id; + private Long[] ids; /** 治疗记录id */ - @Excel(name = "治疗记录") +// @Excel(name = "治疗记录") private Long treatId; private Integer[] treatIds; /** 时间日期 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java index 6d24d82..b5f245a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java @@ -25,6 +25,7 @@ public class Disinfect extends BaseEntity /** id */ private Long id; + private Long[] ids; /** 羊舍id */ @Excel(name = "羊舍") @@ -43,12 +44,12 @@ public class Disinfect extends BaseEntity @Excel(name = "技术员") private String technician; - /** 消毒方式 */ - @Excel(name = "消毒方式") + /** 消毒方式:0喷雾 1撒布 2浸泡 3熏蒸 4其他 */ + @Excel(name = "消毒方式", readConverterExp = "0=喷雾,1=撒布,2=浸泡,3=熏蒸,4=其他") private String way; /** 药品使用记录id */ - @Excel(name = "药品使用记录id") +// @Excel(name = "药品使用记录id") private Integer usageId; /** 比例 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java index 320c014..d973c29 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java @@ -22,6 +22,7 @@ public class Health extends BaseEntity /** $column.columnComment */ private Long id; + private Long[] ids; /** 保健日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -57,7 +58,7 @@ public class Health extends BaseEntity private Long parity; /** 用药记录 */ - @Excel(name = "用药记录") +// @Excel(name = "用药记录") private Integer usageId; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index 9b399ee..1cd4d9d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -26,6 +26,7 @@ public class Immunity extends BaseEntity /** $column.columnComment */ private Long id; + private Long[] ids; /** 羊只id */ private Long sheepId; @@ -59,7 +60,7 @@ public class Immunity extends BaseEntity private Long parity; /** 使用记录 */ - @Excel(name = "使用记录") +// @Excel(name = "使用记录") private Integer usageId; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index 8210e74..b668fef 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -28,6 +28,7 @@ public class SwMedicineUsage extends BaseEntity /** id */ private Integer id; + private Long[] ids; /** 使用名称 */ @Excel(name = "使用名称",width = 20, needMerge = true) diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index 174889f..1173673 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -26,6 +26,7 @@ public class Treatment extends BaseEntity private static final long serialVersionUID = 1L; private Long id; + private Long[] ids; /** 诊疗记录id */ private Long diagId; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java new file mode 100644 index 0000000..84b7228 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java @@ -0,0 +1,74 @@ +package com.zhyc.module.biosafety.enums; + +/** + * 消毒方式枚举 + */ +public enum DisinfectionMethod { + + SPRAY(0, "喷雾"), + SCATTER(1, "撒布"), + SOAK(2, "浸泡"), + FUMIGATE(3, "熏蒸"), + OTHER(4, "其他"); + + private final int code; + private final String desc; + + DisinfectionMethod(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } + + /** + * 根据code获取描述 + */ + public static String getDescByCode(Integer code) { + if (code == null) { + return ""; + } + for (DisinfectionMethod method : values()) { + if (method.code == code) { + return method.desc; + } + } + return ""; + } + + /** + * 根据code获取枚举 + */ + public static DisinfectionMethod getByCode(Integer code) { + if (code == null) { + return null; + } + for (DisinfectionMethod method : values()) { + if (method.code == code) { + return method; + } + } + return null; + } + + /** + * 根据描述获取code + */ + public static Integer getCodeByDesc(String desc) { + if (desc == null || desc.trim().isEmpty()) { + return null; + } + for (DisinfectionMethod method : values()) { + if (method.desc.equals(desc)) { + return method.code; + } + } + return null; + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java index 9e30cc4..a359233 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java @@ -27,7 +27,9 @@ public class UserPostController { @GetMapping("/getUser") public AjaxResult getUserPost(String postCode){ User user = new User(); - user.setPostCode(postCode); + if (postCode != null){ + user.setPostName(postCode); + } List list = userService.getUserListByCode(user); return AjaxResult.success(list); } diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index e4b3b5d..e19566f 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -34,6 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + AND sd.id IN + + #{id} + + and sd.sheep_id = #{sheepId} and sf.bs_manage_tags like concat('%', #{sheepNo}, '%') diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml index 89cfa01..235f8dc 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml @@ -41,30 +41,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.create_by, sd.create_time, ds.sheepfold_name - FROM sw_disinfect sd + FROM sw_disinfect sd LEFT JOIN da_sheepfold ds ON ds.id = sd.sheepfold_id 1 = 1 - AND sd.sheepfold_id = #{sheepfoldId} - AND sd.datetime = #{datetime} - AND sd.technician = #{technician} - AND sd.way = #{way} - AND sd.usage_id = #{usageId} - AND sd.ratio = #{ratio} - AND sd.comment = #{comment} - - - AND EXISTS ( - SELECT 1 - FROM sw_medicine_usage_details mud - JOIN sw_medicine sm ON sm.id = mud.medi_id - WHERE mud.medi_usage = sd.usage_id - AND sm.name like concat('%',#{mediName},'%') - ) - - ${params.dataScope} + + + AND sd.id IN + + #{id} + + + AND sd.sheepfold_id = #{sheepfoldId} + AND sd.datetime = #{datetime} + AND sd.technician = #{technician} + AND sd.way = #{way} + AND sd.usage_id = #{usageId} + AND sd.ratio = #{ratio} + AND sd.comment = #{comment} + + + AND EXISTS ( + SELECT 1 + FROM sw_medicine_usage_details mud + JOIN sw_medicine sm ON sm.id = mud.medi_id + WHERE mud.medi_usage = sd.usage_id + AND sm.name like concat('%',#{mediName},'%') + ) + + ${params.dataScope} - ORDER BY datetime DESC - + ORDER BY datetime DESC - + + + + AND sqr.id IN + + #{id} + + and sheep_id = #{sheepId} and bs.manage_tags like concat('%',#{sheepNo},'%') and datetime between #{params.beginDatetime} and #{params.endDatetime} diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml index 663ff94..a8c4913 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"