diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 45003a0..ab3b646 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 redis: diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 45003a0..ab3b646 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 redis: 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 4a62265..5f4f707 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -12,11 +12,11 @@ SELECT , - su.name as usePersonName, sd.full_name as useDeptName,sd1.full_name as mesureDeptName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 on sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} @@ -142,13 +142,12 @@ SELECT , su.NAME AS usePersonName, - sd.full_name AS useDeptName, - sd1.full_name AS mesureDeptName + sd.full_name AS useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 @@ -174,13 +173,12 @@ SELECT , su.NAME AS usePersonName, - sd.full_name AS useDeptName, - sd1.full_name AS mesureDeptName + sd.full_name AS useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 @@ -214,7 +212,7 @@ FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index cad87ab..1225300 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -257,12 +257,13 @@ @ApiModelProperty(value = "专业分类名称", dataType = "String", required = false) private String majorCategoryName; - /** - * 检定部门 - */ - @TableField("mesure_dept") - @ApiModelProperty(value = "检定部门", dataType = "Long", required = false) - private Long mesureDept; + //废弃，手填检定部门名称 +// /** +// * 检定部门 +// */ +// @TableField("mesure_dept") +// @ApiModelProperty(value = "检定部门", dataType = "Long", required = false) +// private Long mesureDept; /** * 检定部门 diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 45003a0..ab3b646 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 redis: 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 4a62265..5f4f707 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -12,11 +12,11 @@ SELECT , - su.name as usePersonName, sd.full_name as useDeptName,sd1.full_name as mesureDeptName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 on sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} @@ -142,13 +142,12 @@ SELECT , su.NAME AS usePersonName, - sd.full_name AS useDeptName, - sd1.full_name AS mesureDeptName + sd.full_name AS useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 @@ -174,13 +173,12 @@ SELECT , su.NAME AS usePersonName, - sd.full_name AS useDeptName, - sd1.full_name AS mesureDeptName + sd.full_name AS useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 @@ -214,7 +212,7 @@ FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept - LEFT JOIN sys_dept sd1 ON sd1.id = mfa.mesure_dept + WHERE mfa.is_del = 0 AND manager_state != 4 AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index cad87ab..1225300 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -257,12 +257,13 @@ @ApiModelProperty(value = "专业分类名称", dataType = "String", required = false) private String majorCategoryName; - /** - * 检定部门 - */ - @TableField("mesure_dept") - @ApiModelProperty(value = "检定部门", dataType = "Long", required = false) - private Long mesureDept; + //废弃，手填检定部门名称 +// /** +// * 检定部门 +// */ +// @TableField("mesure_dept") +// @ApiModelProperty(value = "检定部门", dataType = "Long", required = false) +// private Long mesureDept; /** * 检定部门 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssetsImport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssetsImport.java index 8c3573f..419b241 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssetsImport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssetsImport.java @@ -152,6 +152,12 @@ private String majorCategory; /** + * 检定部门 + */ + @ExcelProperty("检定部门") + private String mesureDeptName; + + /** * 检定日期 */ @ExcelProperty("检定日期") 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 e57b8f4..641232b 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 @@ -360,9 +360,9 @@ if(Objects.nonNull(equipmentFixedAssets.getUseDept())){ equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept()))); } - if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){ - equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept()))); - } +// if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){ +// equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept()))); +// } } return equipmentFixedAssetsList; }