listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index 0dc28a0..c5e7b0a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -1,11 +1,23 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.annotation.DictCodeField;
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.model.status.EquipmentStatusRelation;
import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
*
* 服务实现类
@@ -15,6 +27,41 @@
* @since 2024-02-21
*/
@Service
+@RequiredArgsConstructor
public class EquipmentBorrowRelationServiceImpl extends ServiceImpl implements IEquipmentBorrowRelationService {
+ private ISystemDeptService systemDeptService;
+ @Override
+ public boolean saveByApproval(Long approvalId, List relationList) {
+ this.deleteByApproval(approvalId);
+ if(CollUtil.isNotEmpty(relationList)){
+ relationList.forEach(i->{
+ i.setBorrowId(approvalId);
+ });
+ return this.saveBatch(relationList);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean deleteByApproval(Long approvalId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("borrow_id",approvalId);
+ return this.remove(wrapper);
+ }
+
+ @Override
+ public List selectByApproval(Long approvalId) {
+ List relations = this.baseMapper.selectByBorrow(approvalId);
+ for (EquipmentBorrowRelation relation : relations) {
+ relation.setCompanyName(systemDeptService.getDeptName(relation.getCompanyId()));
+ relation.setDeptName(systemDeptService.getParentsDeptName(relation.getDeptId()));
+ try {
+ DictCodeUtils.convertDictCodeToName(relation);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return relations;
+ }
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index 0dc28a0..c5e7b0a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -1,11 +1,23 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.annotation.DictCodeField;
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.model.status.EquipmentStatusRelation;
import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
*
* 服务实现类
@@ -15,6 +27,41 @@
* @since 2024-02-21
*/
@Service
+@RequiredArgsConstructor
public class EquipmentBorrowRelationServiceImpl extends ServiceImpl implements IEquipmentBorrowRelationService {
+ private ISystemDeptService systemDeptService;
+ @Override
+ public boolean saveByApproval(Long approvalId, List relationList) {
+ this.deleteByApproval(approvalId);
+ if(CollUtil.isNotEmpty(relationList)){
+ relationList.forEach(i->{
+ i.setBorrowId(approvalId);
+ });
+ return this.saveBatch(relationList);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean deleteByApproval(Long approvalId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("borrow_id",approvalId);
+ return this.remove(wrapper);
+ }
+
+ @Override
+ public List selectByApproval(Long approvalId) {
+ List relations = this.baseMapper.selectByBorrow(approvalId);
+ for (EquipmentBorrowRelation relation : relations) {
+ relation.setCompanyName(systemDeptService.getDeptName(relation.getCompanyId()));
+ relation.setDeptName(systemDeptService.getParentsDeptName(relation.getDeptId()));
+ try {
+ DictCodeUtils.convertDictCodeToName(relation);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return relations;
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
index 1b4acf7..2c16ea5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -1,11 +1,38 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.subcontract.SubcontractorQueryForm;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.model.subcontract.Subcontractor;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.casic.missiles.service.status.IEquipmentBorrowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.enums.PrefixCodeEnum.EQUIPMENT_STATUS_BORROW_PREFIX;
+import static com.casic.missiles.enums.equipment.StatusApprovalTypeEnum.DELAY;
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.EQUIPMENT_BORROW_BEAN_NAME;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL;
+
/**
*
* 服务实现类
@@ -14,7 +41,102 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-@Service
-public class EquipmentBorrowServiceImpl extends ServiceImpl implements IEquipmentBorrowService {
+@Service(EQUIPMENT_BORROW_BEAN_NAME)
+@RequiredArgsConstructor
+public class EquipmentBorrowServiceImpl extends CommonApprovalServiceImpl implements IEquipmentBorrowService {
+ private final AbstractPermissionContext permissionContext;
+ private final ISystemDeptService systemDeptService;
+ private final IEquipmentBorrowRelationService relationService;
+
+ public String getFormId(Long borrowDeptId){
+ // todo 有问题：连-连
+ AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+ Long userDeptId = authUser.getDeptId();
+
+ Dept userDept = systemDeptService.getById(userDeptId);
+ Dept borrowDept = systemDeptService.getById(borrowDeptId);
+
+ if(userDept.getPid().equals(borrowDept.getPid())){
+ return EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode();
+ }else {
+ return EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode();
+ }
+ }
+
+ @Override
+ public Long saveOrUpdateApproval(EquipmentBorrow approvalForm) {
+ // 1. 生成统一编号
+ if (StrUtil.isEmpty(approvalForm.getApprovalNo())) {
+ Long maxNo = this.baseMapper.selectMaxNo();
+ approvalForm.setApprovalNo(NumberGeneratorUtil.getContactNo(EQUIPMENT_STATUS_BORROW_PREFIX, maxNo));
+ }
+ // 2. 设置申请状态：草稿箱
+ approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+ this.saveOrUpdate(approvalForm);
+
+ relationService.saveByApproval(approvalForm.getId(),approvalForm.getRelationList());
+ // 4. 返回申请记录id
+ return approvalForm.getId();
+
+ }
+
+ @Override
+ public EquipmentBorrow detail(Long approvalId) {
+ EquipmentBorrow borrow = this.getById(approvalId);
+ borrow.setCompanyName(systemDeptService.getDeptName(borrow.getCompanyId()));
+ borrow.setDeptName(systemDeptService.getParentsDeptName(borrow.getDeptId()));
+ borrow.setBorrowDeptName(systemDeptService.getParentsDeptName(borrow.getBorrowDeptId()));
+
+ borrow.setRelationList(relationService.selectByApproval(approvalId));
+ borrow.setEquipmentCount(borrow.getRelationList().size());
+ return borrow;
+ }
+
+ @Override
+ public EquipmentBorrow warpper(EquipmentBorrow obj) {
+ obj.setCompanyName(systemDeptService.getDeptName(obj.getCompanyId()));
+ obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
+ obj.setBorrowDeptName(systemDeptService.getParentsDeptName(obj.getBorrowDeptId()));
+ return super.warpper(obj);
+ }
+
+ @Override
+ public QueryWrapper commonQuery(EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper query = new QueryWrapper<>();
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalNo()),"approval_no",queryForm.getApprovalNo());
+ query.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId());
+ if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ List deptIds = new ArrayList<>();
+ deptIds.add(queryForm.getDeptId());
+ deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ query.in("dept_id",deptIds);
+ }
+ query.like(StrUtil.isNotEmpty(queryForm.getBorrowReason()),"borrow_reason",queryForm.getBorrowReason());
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalUserName()),"approval_user_name",queryForm.getApprovalUserName());
+ query.ge(StrUtil.isNotEmpty(queryForm.getApprovalTimeStart()), "approval_time", queryForm.getApprovalTimeStart());
+ query.le(StrUtil.isNotEmpty(queryForm.getApprovalTimeEnd()), "approval_time", queryForm.getApprovalTimeEnd());
+
+ return query;
+ }
+
+ @Override
+ public > E page(E page, Wrapper queryWrapper) {
+ List list = this.baseMapper.selectListPage((Page) page, (QueryWrapper) queryWrapper);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public Page allPage(Page page, EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper queryWrapper = commonQuery(queryForm);
+ page = this.page(page,queryWrapper);
+ page.getRecords().forEach(this::warpper);
+ return page;
+ }
+
+ @Override
+ public void setBizNo(EquipmentBorrow obj) {
+ obj.setBizNo(obj.getApprovalNo());
+ }
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index 0dc28a0..c5e7b0a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -1,11 +1,23 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.annotation.DictCodeField;
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.model.status.EquipmentStatusRelation;
import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
*
* 服务实现类
@@ -15,6 +27,41 @@
* @since 2024-02-21
*/
@Service
+@RequiredArgsConstructor
public class EquipmentBorrowRelationServiceImpl extends ServiceImpl implements IEquipmentBorrowRelationService {
+ private ISystemDeptService systemDeptService;
+ @Override
+ public boolean saveByApproval(Long approvalId, List relationList) {
+ this.deleteByApproval(approvalId);
+ if(CollUtil.isNotEmpty(relationList)){
+ relationList.forEach(i->{
+ i.setBorrowId(approvalId);
+ });
+ return this.saveBatch(relationList);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean deleteByApproval(Long approvalId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("borrow_id",approvalId);
+ return this.remove(wrapper);
+ }
+
+ @Override
+ public List selectByApproval(Long approvalId) {
+ List relations = this.baseMapper.selectByBorrow(approvalId);
+ for (EquipmentBorrowRelation relation : relations) {
+ relation.setCompanyName(systemDeptService.getDeptName(relation.getCompanyId()));
+ relation.setDeptName(systemDeptService.getParentsDeptName(relation.getDeptId()));
+ try {
+ DictCodeUtils.convertDictCodeToName(relation);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return relations;
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
index 1b4acf7..2c16ea5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -1,11 +1,38 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.subcontract.SubcontractorQueryForm;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.model.subcontract.Subcontractor;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.casic.missiles.service.status.IEquipmentBorrowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.enums.PrefixCodeEnum.EQUIPMENT_STATUS_BORROW_PREFIX;
+import static com.casic.missiles.enums.equipment.StatusApprovalTypeEnum.DELAY;
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.EQUIPMENT_BORROW_BEAN_NAME;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL;
+
/**
*
* 服务实现类
@@ -14,7 +41,102 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-@Service
-public class EquipmentBorrowServiceImpl extends ServiceImpl implements IEquipmentBorrowService {
+@Service(EQUIPMENT_BORROW_BEAN_NAME)
+@RequiredArgsConstructor
+public class EquipmentBorrowServiceImpl extends CommonApprovalServiceImpl implements IEquipmentBorrowService {
+ private final AbstractPermissionContext permissionContext;
+ private final ISystemDeptService systemDeptService;
+ private final IEquipmentBorrowRelationService relationService;
+
+ public String getFormId(Long borrowDeptId){
+ // todo 有问题：连-连
+ AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+ Long userDeptId = authUser.getDeptId();
+
+ Dept userDept = systemDeptService.getById(userDeptId);
+ Dept borrowDept = systemDeptService.getById(borrowDeptId);
+
+ if(userDept.getPid().equals(borrowDept.getPid())){
+ return EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode();
+ }else {
+ return EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode();
+ }
+ }
+
+ @Override
+ public Long saveOrUpdateApproval(EquipmentBorrow approvalForm) {
+ // 1. 生成统一编号
+ if (StrUtil.isEmpty(approvalForm.getApprovalNo())) {
+ Long maxNo = this.baseMapper.selectMaxNo();
+ approvalForm.setApprovalNo(NumberGeneratorUtil.getContactNo(EQUIPMENT_STATUS_BORROW_PREFIX, maxNo));
+ }
+ // 2. 设置申请状态：草稿箱
+ approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+ this.saveOrUpdate(approvalForm);
+
+ relationService.saveByApproval(approvalForm.getId(),approvalForm.getRelationList());
+ // 4. 返回申请记录id
+ return approvalForm.getId();
+
+ }
+
+ @Override
+ public EquipmentBorrow detail(Long approvalId) {
+ EquipmentBorrow borrow = this.getById(approvalId);
+ borrow.setCompanyName(systemDeptService.getDeptName(borrow.getCompanyId()));
+ borrow.setDeptName(systemDeptService.getParentsDeptName(borrow.getDeptId()));
+ borrow.setBorrowDeptName(systemDeptService.getParentsDeptName(borrow.getBorrowDeptId()));
+
+ borrow.setRelationList(relationService.selectByApproval(approvalId));
+ borrow.setEquipmentCount(borrow.getRelationList().size());
+ return borrow;
+ }
+
+ @Override
+ public EquipmentBorrow warpper(EquipmentBorrow obj) {
+ obj.setCompanyName(systemDeptService.getDeptName(obj.getCompanyId()));
+ obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
+ obj.setBorrowDeptName(systemDeptService.getParentsDeptName(obj.getBorrowDeptId()));
+ return super.warpper(obj);
+ }
+
+ @Override
+ public QueryWrapper commonQuery(EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper query = new QueryWrapper<>();
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalNo()),"approval_no",queryForm.getApprovalNo());
+ query.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId());
+ if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ List deptIds = new ArrayList<>();
+ deptIds.add(queryForm.getDeptId());
+ deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ query.in("dept_id",deptIds);
+ }
+ query.like(StrUtil.isNotEmpty(queryForm.getBorrowReason()),"borrow_reason",queryForm.getBorrowReason());
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalUserName()),"approval_user_name",queryForm.getApprovalUserName());
+ query.ge(StrUtil.isNotEmpty(queryForm.getApprovalTimeStart()), "approval_time", queryForm.getApprovalTimeStart());
+ query.le(StrUtil.isNotEmpty(queryForm.getApprovalTimeEnd()), "approval_time", queryForm.getApprovalTimeEnd());
+
+ return query;
+ }
+
+ @Override
+ public > E page(E page, Wrapper queryWrapper) {
+ List list = this.baseMapper.selectListPage((Page) page, (QueryWrapper) queryWrapper);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public Page allPage(Page page, EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper queryWrapper = commonQuery(queryForm);
+ page = this.page(page,queryWrapper);
+ page.getRecords().forEach(this::warpper);
+ return page;
+ }
+
+ @Override
+ public void setBizNo(EquipmentBorrow obj) {
+ obj.setBizNo(obj.getApprovalNo());
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
index a59b3ee..a75b088 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,9 @@
*/
public interface IEquipmentBorrowRelationService extends IService {
+ boolean saveByApproval(Long approvalId, List relationList);
+
+ boolean deleteByApproval(Long approvalId);
+
+ List selectByApproval(Long approvalId);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index 0dc28a0..c5e7b0a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -1,11 +1,23 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.annotation.DictCodeField;
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.model.status.EquipmentStatusRelation;
import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
*
* 服务实现类
@@ -15,6 +27,41 @@
* @since 2024-02-21
*/
@Service
+@RequiredArgsConstructor
public class EquipmentBorrowRelationServiceImpl extends ServiceImpl implements IEquipmentBorrowRelationService {
+ private ISystemDeptService systemDeptService;
+ @Override
+ public boolean saveByApproval(Long approvalId, List relationList) {
+ this.deleteByApproval(approvalId);
+ if(CollUtil.isNotEmpty(relationList)){
+ relationList.forEach(i->{
+ i.setBorrowId(approvalId);
+ });
+ return this.saveBatch(relationList);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean deleteByApproval(Long approvalId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("borrow_id",approvalId);
+ return this.remove(wrapper);
+ }
+
+ @Override
+ public List selectByApproval(Long approvalId) {
+ List relations = this.baseMapper.selectByBorrow(approvalId);
+ for (EquipmentBorrowRelation relation : relations) {
+ relation.setCompanyName(systemDeptService.getDeptName(relation.getCompanyId()));
+ relation.setDeptName(systemDeptService.getParentsDeptName(relation.getDeptId()));
+ try {
+ DictCodeUtils.convertDictCodeToName(relation);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return relations;
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
index 1b4acf7..2c16ea5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -1,11 +1,38 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.subcontract.SubcontractorQueryForm;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.model.subcontract.Subcontractor;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.casic.missiles.service.status.IEquipmentBorrowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.enums.PrefixCodeEnum.EQUIPMENT_STATUS_BORROW_PREFIX;
+import static com.casic.missiles.enums.equipment.StatusApprovalTypeEnum.DELAY;
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.EQUIPMENT_BORROW_BEAN_NAME;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL;
+
/**
*
* 服务实现类
@@ -14,7 +41,102 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-@Service
-public class EquipmentBorrowServiceImpl extends ServiceImpl implements IEquipmentBorrowService {
+@Service(EQUIPMENT_BORROW_BEAN_NAME)
+@RequiredArgsConstructor
+public class EquipmentBorrowServiceImpl extends CommonApprovalServiceImpl implements IEquipmentBorrowService {
+ private final AbstractPermissionContext permissionContext;
+ private final ISystemDeptService systemDeptService;
+ private final IEquipmentBorrowRelationService relationService;
+
+ public String getFormId(Long borrowDeptId){
+ // todo 有问题：连-连
+ AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+ Long userDeptId = authUser.getDeptId();
+
+ Dept userDept = systemDeptService.getById(userDeptId);
+ Dept borrowDept = systemDeptService.getById(borrowDeptId);
+
+ if(userDept.getPid().equals(borrowDept.getPid())){
+ return EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode();
+ }else {
+ return EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode();
+ }
+ }
+
+ @Override
+ public Long saveOrUpdateApproval(EquipmentBorrow approvalForm) {
+ // 1. 生成统一编号
+ if (StrUtil.isEmpty(approvalForm.getApprovalNo())) {
+ Long maxNo = this.baseMapper.selectMaxNo();
+ approvalForm.setApprovalNo(NumberGeneratorUtil.getContactNo(EQUIPMENT_STATUS_BORROW_PREFIX, maxNo));
+ }
+ // 2. 设置申请状态：草稿箱
+ approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+ this.saveOrUpdate(approvalForm);
+
+ relationService.saveByApproval(approvalForm.getId(),approvalForm.getRelationList());
+ // 4. 返回申请记录id
+ return approvalForm.getId();
+
+ }
+
+ @Override
+ public EquipmentBorrow detail(Long approvalId) {
+ EquipmentBorrow borrow = this.getById(approvalId);
+ borrow.setCompanyName(systemDeptService.getDeptName(borrow.getCompanyId()));
+ borrow.setDeptName(systemDeptService.getParentsDeptName(borrow.getDeptId()));
+ borrow.setBorrowDeptName(systemDeptService.getParentsDeptName(borrow.getBorrowDeptId()));
+
+ borrow.setRelationList(relationService.selectByApproval(approvalId));
+ borrow.setEquipmentCount(borrow.getRelationList().size());
+ return borrow;
+ }
+
+ @Override
+ public EquipmentBorrow warpper(EquipmentBorrow obj) {
+ obj.setCompanyName(systemDeptService.getDeptName(obj.getCompanyId()));
+ obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
+ obj.setBorrowDeptName(systemDeptService.getParentsDeptName(obj.getBorrowDeptId()));
+ return super.warpper(obj);
+ }
+
+ @Override
+ public QueryWrapper commonQuery(EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper query = new QueryWrapper<>();
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalNo()),"approval_no",queryForm.getApprovalNo());
+ query.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId());
+ if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ List deptIds = new ArrayList<>();
+ deptIds.add(queryForm.getDeptId());
+ deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ query.in("dept_id",deptIds);
+ }
+ query.like(StrUtil.isNotEmpty(queryForm.getBorrowReason()),"borrow_reason",queryForm.getBorrowReason());
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalUserName()),"approval_user_name",queryForm.getApprovalUserName());
+ query.ge(StrUtil.isNotEmpty(queryForm.getApprovalTimeStart()), "approval_time", queryForm.getApprovalTimeStart());
+ query.le(StrUtil.isNotEmpty(queryForm.getApprovalTimeEnd()), "approval_time", queryForm.getApprovalTimeEnd());
+
+ return query;
+ }
+
+ @Override
+ public > E page(E page, Wrapper queryWrapper) {
+ List list = this.baseMapper.selectListPage((Page) page, (QueryWrapper) queryWrapper);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public Page allPage(Page page, EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper queryWrapper = commonQuery(queryForm);
+ page = this.page(page,queryWrapper);
+ page.getRecords().forEach(this::warpper);
+ return page;
+ }
+
+ @Override
+ public void setBizNo(EquipmentBorrow obj) {
+ obj.setBizNo(obj.getApprovalNo());
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
index a59b3ee..a75b088 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,9 @@
*/
public interface IEquipmentBorrowRelationService extends IService {
+ boolean saveByApproval(Long approvalId, List relationList);
+
+ boolean deleteByApproval(Long approvalId);
+
+ List selectByApproval(Long approvalId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
index 0a88522..d05549a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.service.status;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.ICommonApprovalService;
/**
*
@@ -11,6 +14,9 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-public interface IEquipmentBorrowService extends IService {
+public interface IEquipmentBorrowService extends ICommonApprovalService {
+ String getFormId(Long borrowDeptId);
+ Long saveOrUpdateApproval(EquipmentBorrow borrowForm);
+ EquipmentBorrow detail(Long approvalId);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 74da3d5..64aef87 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 642f1aa..a42e371 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -38,6 +38,8 @@
*/
String EQUIPMENT_STATUS_DELAY_PREFIX = "sbyysq";
+ String EQUIPMENT_STATUS_BORROW_PREFIX = "sbjieyongsq";
+
/**
* 计量计划：年度计划
*/
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 510194d..38430d6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -9,6 +9,8 @@
String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean";
+ String EQUIPMENT_BORROW_BEAN_NAME = "equipmentBorrowBean";
+
String PLAN_BEAN_NAME = "planBean";
String INSPECTION_BEAN_NAME = "inspectionBean";
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index b238263..0e9c0a7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -7,7 +7,7 @@
public enum AwareActionStatusEnum implements ActionStatusBeanEnum {
EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""),
EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""),
-
+ EQUIPMENT_BORROW_APPROVAL(EQUIPMENT_BORROW_BEAN_NAME, ""),
PLAN_APPROVAL(PLAN_BEAN_NAME,""),
INSPECTION_EARLY_APPROVAL(INSPECTION_BEAN_NAME,""),
INSPECTION_DELAY_APPROVAL(INSPECTION_BEAN_NAME,""),
@@ -50,6 +50,8 @@
put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DELAY_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(),EQUIPMENT_STATUS_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
+ put(ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode(), EQUIPMENT_BORROW_APPROVAL);
// 分包管理
put(ApplyFromIdEnum.SUBCONTRACTOR_APPROVAL.getCode(), SUBCONTRACTOR_APPROVAL);
put(ApplyFromIdEnum.SUBCONTRACT_REVIEW_APPROVAL.getCode(), SUBCONTRACT_REVIEW_APPROVAL);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 34c25c7..be06728 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -10,6 +10,10 @@
EQUIPMENT_DISABLE_APPROVAL("sbjysq", "状态维护", "设备禁用申请"),
EQUIPMENT_SCRAP_APPROVAL("sbbfsq", "状态维护", "设备报废申请"),
EQUIPMENT_DELAY_APPROVAL("sbyysq", "状态维护", "设备延用申请"),
+
+ EQUIPMENT_BORROW_APPROVAL_INTERNAL("sbjjieyongsq", "状态维护", "设备借用申请（不跨连）"),
+
+ EQUIPMENT_BORROW_APPROVAL_EXTERNAL("sbjjieyongsq-kl", "状态维护", "设备借用申请（跨连）"),
PLAN_APPROVAL("jljhgl","计量计划","计量计划"),
INSPECTION_EARLY_APPROVAL("tqsjsq","计量计划","提前送检申请"),
INSPECTION_DELAY_APPROVAL("ycsjsq","计量计划","延迟送检申请"),
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 3992e23..6bc0a98 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
index 219d6d8..a692c04 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java
@@ -50,6 +50,12 @@
@Param("ew") QueryWrapper queryWrapper,
@Param("checkedStatus") List checkedStatus);
+ @Select("SELECT DISTINCT manufacturer FROM `eqpt_equipment_info` where is_del = '0' and manufacturer is not NULL and manufacturer != '' ORDER BY manufacturer")
+ List listManufacturer();
+
+ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization")
+ List listCheckOrganization();
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
index 82814ec..a87a3c6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentModelInfoMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -30,6 +31,11 @@
@Param("page") Page page,
@Param("ew")QueryWrapper queryWrapper);
- String getLabLocation(@Param("companyId") Long companyId);
+// String getLabLocation(@Param("companyId") Long companyId);
+
+ @Select("select default_lab from biz_resource_customer_info where dept_id = #{companyId}")
+ String defaultLab(Long companyId);
+
+ List> defaultLabs(@Param("companyIds") List companyIds);
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
index ac2e80c..8f55658 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowMapper.java
@@ -1,7 +1,14 @@
package com.casic.missiles.mapper.status;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +20,10 @@
*/
public interface EquipmentBorrowMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(approval_no, 12)), 0) from eqpt_equipment_borrow")
+ Long selectMaxNo();
+
+ List selectListPage(@Param("page") Page page, @Param("ew") QueryWrapper queryWrapper);
+
+
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
index 05a33d3..5dd70b0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentBorrowRelationMapper.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,5 @@
*/
public interface EquipmentBorrowRelationMapper extends BaseMapper {
+ List selectByBorrow(Long borrowId);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
index 2ddebe6..bbcad14 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentModelInfoMapper.xml
@@ -59,4 +59,17 @@
and A.dept_id = #{companyId}
+
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
index d024208..5a6ea00 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowMapper.xml
@@ -17,11 +17,23 @@
+
+
- id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status
+ id, approval_no, company_id, dept_id, approval_user_id, approval_user_name, approval_time, borrow_dept_id, borrow_reason, create_time, update_time, process_id, approval_status,form_id
+
diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
index c950f96..efc9452 100644
--- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentBorrowRelationMapper.xml
@@ -18,4 +18,28 @@
id, borrow_id, equipment_id, return_date, remark, create_time, update_time
+
+
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index eb329cb..c43ce5a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-job
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 8270587..88c418a 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -202,4 +202,26 @@
return ReturnUtil.success();
}
+ @ApiOperation("生产厂家列表")
+ @GetMapping("listManufacturer")
+ @ResponseBody
+ public ReturnDTO> listManufacturer(){
+ return ReturnUtil.success(equipmentInfoService.listManufacturer());
+ }
+
+ @ApiOperation("检定校准机构列表")
+ @GetMapping("listCheckOrganization")
+ @ResponseBody
+ public ReturnDTO> listCheckOrganization(){
+ return ReturnUtil.success(equipmentInfoService.listCheckOrganization());
+ }
+
+ @ApiOperation("更新全部检定去向")
+ @GetMapping("updateCheckDestination")
+ @ResponseBody
+ public ReturnDTO updateCheckDestination(Long modelId){
+ equipmentInfoService.updateCheckDestination(modelId);
+ return ReturnUtil.success();
+ }
+
}
diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
new file mode 100644
index 0000000..5af4339
--- /dev/null
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/status/EquipmentBorrowController.java
@@ -0,0 +1,164 @@
+package com.casic.missiles.controller.status;
+
+import com.casic.missiles.controller.CommonApprovalController;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.status.EquipmentStatusQueryForm;
+import com.casic.missiles.model.status.EquipmentBorrow;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.status.IEquipmentBorrowService;
+import com.casic.missiles.service.status.IEquipmentStatusApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 受检设备-状态维护登记表 前端控制器
+ *
+ *
+ * @author zhangyingjie
+ * @since 2023-08-07
+ */
+@Api(tags = "设备借用接口")
+@Slf4j
+@RestController
+@RequestMapping("/borrow")
+public class EquipmentBorrowController extends CommonApprovalController {
+
+ @Autowired
+ private IEquipmentBorrowService service;
+
+ public EquipmentBorrowController(IEquipmentBorrowService service) {
+ super(service);
+ }
+
+ @ApiOperation("保存、编辑审批")
+ @PostMapping("/approval/saveOrUpdate")
+ @ResponseBody
+ public ReturnDTO saveApproval(@RequestBody EquipmentBorrow approvalForm) {
+ Long approvalId = service.saveOrUpdateApproval(approvalForm);
+ return ReturnUtil.success(approvalId);
+ }
+
+ @ApiOperation("查看审批-基本信息")
+ @GetMapping("/approval/detail")
+ @ResponseBody
+ public ReturnDTO approvalDetail(Long id) {
+ EquipmentBorrow info = service.detail(id);
+ return ReturnUtil.success(info);
+ }
+
+ @ApiOperation("获取formId")
+ @GetMapping("/getFormId")
+ @ResponseBody
+ public ReturnDTO getFormId(Long borrowDeptId){
+ return ReturnUtil.success(service.getFormId(borrowDeptId));
+ }
+
+// @ApiOperation("删除审批")
+// @PostMapping("/approval/delete")
+// @ResponseBody
+// public ReturnDTO deleteApproval(Long id) {
+// approvalService.removeApproval(id);
+// return ReturnUtil.success();
+// }
+//
+// @ApiOperation("提交审批")
+// @PostMapping("/approval/submit")
+// @ResponseBody
+// public ReturnDTO submitApproval(@RequestBody ApprovalSubmitRequest submitRequest) {
+// return approvalService.submitApproval(submitRequest);
+// }
+//
+// @ApiOperation("取消审批")
+// @PostMapping("/approval/cancel")
+// @ResponseBody
+// public ReturnDTO cancelApproval(@RequestBody ApprovalRevokeRequest revokeRequest) {
+// return approvalService.cancelApproval(revokeRequest);
+// }
+//
+// @ApiOperation("同意审批")
+// @PostMapping("/approval/agree")
+// @ResponseBody
+// public ReturnDTO agreeApproval(@RequestBody BaseApprovalRequest agreeRequest) {
+// return approvalService.agreeApproval(agreeRequest);
+// }
+//
+// @ApiOperation("拒绝审批")
+// @PostMapping("/approval/refuse")
+// @ResponseBody
+// public ReturnDTO refuseApproval(@RequestBody BaseApprovalRequest refuseRequest) {
+// return approvalService.refuseApproval(refuseRequest);
+// }
+//
+//
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-审批/草稿箱/审批中/已通过/未通过/已取消")
+// @GetMapping("/approval/listPage")
+// @ResponseBody
+// public ReturnDTO> listPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.listPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-待审批")
+// @GetMapping("/approval/toApprovalListPage")
+// @ResponseBody
+// public ReturnDTO> toApprovalListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.toApprovalListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "formId", value = "流程formId", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-已审批")
+// @GetMapping("/approval/approvedListPage")
+// @ResponseBody
+// public ReturnDTO> approvedListPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String equipmentType,
+// String formId) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.approvedListPage(page, approvalNo, approvalType, equipmentNo, equipmentName, formId);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+//
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "approvalNo", value = "登记表编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalType", value = "申请类型", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentNo", value = "统一编号", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "equipmentName", value = "设备名称", dataType = "String", paramType = "query"),
+// @ApiImplicitParam(name = "approvalStatus", value = "申请状态", dataType = "String", paramType = "query")
+// })
+// @ApiOperation("审批列表-全部")
+// @GetMapping("/approval/allPage")
+// @ResponseBody
+// public ReturnDTO> allPage(String approvalNo, String approvalType, String equipmentNo, String equipmentName, String approvalStatus) {
+// Page page = PageFactory.defaultPage();
+// page = approvalService.allPage(page, approvalNo, approvalType, equipmentNo, equipmentName, approvalStatus);
+// return ReturnUtil.success(super.packForBT(page));
+// }
+}
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
index 3725b9b..e6a722b 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true
username: root
password: Casic203!
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index a8037f3..48bc0da 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.1.1
+ 1.3.1.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 2d62d25..c9237cb 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
index 7803273..e7b1bda 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentModelQueryForm.java
@@ -26,6 +26,9 @@
@ApiModelProperty("设备分类(字典code)")
private String category;
+ @ApiModelProperty("计量站是否可检")
+ private String inspectable;
+
@ApiModelProperty("id列表（导出用）")
private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
index fa2567a..7d9691e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
@@ -27,6 +27,8 @@
@ApiModelProperty("型号规格")
private String model;
+ @ApiModelProperty("生产厂家")
+ private String manufacturer;
@ApiModelProperty("出厂编号")
private String manufactureNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
new file mode 100644
index 0000000..ff0c4b7
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/status/EquipmentBorrowQueryForm.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.status;
+
+import com.casic.missiles.dto.BaseQueryForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class EquipmentBorrowQueryForm extends BaseQueryForm {
+
+ @ApiModelProperty("登记表编号")
+ String approvalNo;
+
+ @ApiModelProperty(value = "所在单位id")
+ private Long companyId;
+
+ @ApiModelProperty(value = "使用部门id")
+ private Long deptId;
+
+ @ApiModelProperty("借用原因")
+ private String borrowReason;
+
+ @ApiModelProperty("申请人")
+ private String approvalUserName;
+
+ @ApiModelProperty("申请开始时间")
+ private String approvalTimeStart;
+
+ @ApiModelProperty("申请结束时间")
+ private String approvalTimeEnd;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
index d4b20e9..e0fca31 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentModelInfo.java
@@ -122,6 +122,11 @@
@TableField("inspectable")
private String inspectable;
+
+ @TableField(exist = false)
+ @ExcelProperty("计量站是否可检")
+ private String inspectableName;
+
/**
* 创建人id
*/
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
index 0d0f22b..d4e5e38 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrow.java
@@ -5,6 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import com.casic.missiles.model.CommonApproval;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,87 +26,128 @@
@Getter
@Setter
@TableName("eqpt_equipment_borrow")
-public class EquipmentBorrow implements Serializable {
+public class EquipmentBorrow extends CommonApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId("id")
+ @ApiModelProperty("主键")
+ @TableId("id")
private Long id;
/**
* 申请编号
*/
+ @ApiModelProperty("申请编号")
@TableField("approval_no")
private String approvalNo;
/**
* 所在单位
*/
+ @ApiModelProperty("所在单位id")
@TableField("company_id")
private Long companyId;
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
/**
* 使用部门
*/
+ @ApiModelProperty("使用部门id")
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
/**
* 申请人id
*/
+ @ApiModelProperty("申请人id")
@TableField("approval_user_id")
private Long approvalUserId;
/**
* 申请人姓名
*/
+ @ApiModelProperty("申请人姓名")
@TableField("approval_user_name")
private String approvalUserName;
/**
* 申请时间
*/
+ @ApiModelProperty("申请时间")
@TableField("approval_time")
- private LocalDateTime approvalTime;
+ private Date approvalTime;
/**
* 借用部门
*/
+ @ApiModelProperty("借用部门id")
@TableField("borrow_dept_id")
private Long borrowDeptId;
+ @ApiModelProperty("借用部门名称")
+ @TableField(exist = false)
+ private String borrowDeptName;
+
/**
* 借用原因
*/
+ @ApiModelProperty("借用原因")
@TableField("borrow_reason")
private String borrowReason;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 流程实例id
*/
+ @ApiModelProperty("流程实例id")
@TableField("process_id")
private String processId;
/**
* 审批状态
*/
+ @ApiModelProperty("审批状态")
@TableField("approval_status")
+ @DictCodeField(cacheName = MeterDictCode.APPROVAL_STATUS)
private String approvalStatus;
+ @ApiModelProperty("审批状态名称")
+ @TableField(exist = false)
+ private String approvalStatusName;
+
+ @ApiModelProperty("form_id")
+ @TableField("form_id")
+ private String formId;
+
+ @ApiModelProperty("借用设备数量")
+ @TableField(exist = false)
+ private Integer equipmentCount;
+
+ @ApiModelProperty("借用设备列表")
+ @TableField(exist = false)
+ private List relationList;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
index f4087e1..040bf3e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentBorrowRelation.java
@@ -1,10 +1,16 @@
package com.casic.missiles.model.status;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -26,44 +32,107 @@
/**
* 主键
*/
- @TableId("id")
+ @TableId("id")
+ @ApiModelProperty("主键")
private Long id;
/**
* 借用申请id
*/
+ @ApiModelProperty("借用申请id")
@TableField("borrow_id")
private Long borrowId;
/**
* 设备id
*/
+ @ApiModelProperty("设备id")
@TableField("equipment_id")
private Long equipmentId;
+ @ApiModelProperty(value = "设备名称",notes = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
+ @ApiModelProperty(value = "型号规格",notes = "型号规格")
+ @TableField(exist = false)
+ private String model;
+
+ @ApiModelProperty(value = "生产厂家",notes = "生产厂家")
+ @TableField(exist = false)
+ private String manufacturer;
+
+ @ApiModelProperty(value = "出厂编号",notes = "出厂编号")
+ @TableField(exist = false)
+ private String manufactureNo;
+
+ @ApiModelProperty(value = "所在单位id",notes = "所在单位id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty("所在单位名称")
+ @TableField(exist = false)
+ private String companyName;
+
+ /**
+ * 使用部门id
+ */
+ @ApiModelProperty(value = "使用部门id",notes = "使用部门id")
+ @TableField(exist = false)
+ private Long deptId;
+
+ @ApiModelProperty("使用部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("使用岗位")
+ @TableField(exist = false)
+ private String usePosition;
+
+ @ApiModelProperty("安装位置(选择)")
+ @TableField(exist = false)
+ private String installLocation;
+
+ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置")
+ @TableField(exist = false)
+ private String installLocationExt;
+
+ @ApiModelProperty(value = "计量标识",notes = "计量标识code")
+ @TableField(exist = false)
+ @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY)
+ private String meterIdentify;
+
+ @ApiModelProperty("计量标识名称")
+ @TableField(exist = false)
+ private String meterIdentifyName;
+
/**
* 归还日期
*/
+ @ApiModelProperty("归还日期")
@TableField("return_date")
private LocalDateTime returnDate;
/**
* 备注
*/
+ @ApiModelProperty("备注")
@TableField("remark")
private String remark;
/**
* 创建时间
*/
+ @ApiModelProperty("创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty("更新时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 3d72bed..e28aca4 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.1.1
+ 1.3.1.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-model
- 1.3.1.1
+ 1.3.1.2
com.casic
casic-metering-common
- 1.3.1.1
+ 1.3.1.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
index d3c9f3a..3cd9a2d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
@@ -78,4 +78,9 @@
Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm);
+ List listManufacturer();
+
+ List listCheckOrganization();
+
+ void updateCheckDestination(Long modelId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
index fef1e36..295014d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentModelInfoService.java
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
*
@@ -38,6 +39,10 @@
String defaultCheckDestination(Long modelId,Long companyId);
+ List> getDefaultLabs(List companyIds);
+
+ String classifyCheckDestination(String defaultLab,String inspectable);
+
EquipmentImportDuplicationResult batchImport(MultipartFile file) throws IOException;
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index dc442af..789d9d3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -189,17 +189,17 @@
} else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -231,6 +231,7 @@
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getUsageStatusList()), "usage_status", queryForm.getUsageStatusList());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()), "model", queryForm.getModel());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufactureNo()), "manufacture_no", queryForm.getManufactureNo());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getManufacturer()), "manufacturer", queryForm.getManufacturer());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getDirectorName()), "director_name", queryForm.getDirectorName());
@@ -249,7 +250,7 @@
}
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCheckOrganization()), "check_organization", queryForm.getCheckOrganization());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getMeterIdentify()), "meter_identify", queryForm.getMeterIdentify());
- queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()),"meter_identify");
+ queryWrapper.isNull("66".equals(queryForm.getMeterIdentify()), "meter_identify");
queryWrapper.ge(StrUtil.isNotEmpty(queryForm.getCheckDateStart()), "check_date", queryForm.getCheckDateStart());
queryWrapper.le(StrUtil.isNotEmpty(queryForm.getCheckDateEnd()), "check_date", queryForm.getCheckDateEnd());
}
@@ -346,7 +347,7 @@
rowIndex = Integer.valueOf(rowStr);
colIndex = Integer.valueOf(colStr) + 1;
} catch (NumberFormatException nfx) {
- throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:"+ colStr));
+ throw new BusinessException(1500, String.format("导入日期格式错误，获取日期位置信息转换异常，行:" + rowStr, "列:" + colStr));
}
throw new BusinessException(1500, String.format("第" + rowIndex + "行,第" + colIndex + "列" + "日期格式不正确"));
}
@@ -730,21 +731,20 @@
AuthUser authUser = permissionContext.getAuthService().getLoginUser();
if (authUser.getRoleTips().contains(operatorRoleTip)) {
queryForm.setDirectorId(authUser.getId());
- }
- else {
+ } else {
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -770,7 +770,7 @@
} else {
//queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDeptId()), "dept_id", queryForm.getDeptId());
- queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()),"director_id",queryForm.getDirectorId());
+ queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getDirectorId()), "director_id", queryForm.getDirectorId());
queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()), "company_id", queryForm.getCompanyId());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getDeptIds()), "dept_id", queryForm.getDeptIds());
queryWrapper.like(StrUtil.isNotEmpty(queryForm.getEquipmentNo()), "equipment_no", queryForm.getEquipmentNo());
@@ -817,13 +817,13 @@
EquipmentStatusTypeEnum.DELAY,
EquipmentStatusTypeEnum.SEAL));
queryWrapper.eq("check_status", 0); //未送检设备
- queryWrapper.eq("check_destination",CHECK_DESTINATION_METER);
- if(StrUtil.isNotEmpty(queryForm.getMeasureCompany())){
- if(queryForm.getMeasureCompany().contains(XC_LAB)){
- queryWrapper.like("inspectable",XC_INSPECTABLE);
+ queryWrapper.eq("check_destination", CHECK_DESTINATION_METER);
+ if (StrUtil.isNotEmpty(queryForm.getMeasureCompany())) {
+ if (queryForm.getMeasureCompany().contains(XC_LAB)) {
+ queryWrapper.like("inspectable", XC_INSPECTABLE);
}
- if(queryForm.getMeasureCompany().contains(HK_LAB)){
- queryWrapper.like("inspectable",HK_INSPECTABLE);
+ if (queryForm.getMeasureCompany().contains(HK_LAB)) {
+ queryWrapper.like("inspectable", HK_INSPECTABLE);
}
}
List list = this.baseMapper.selectRemindListPage(page, null, queryWrapper,
@@ -921,17 +921,17 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// 级联前端传入的 查询部门的下级部门
Set formDeptIdSet = new HashSet<>();
- if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptId())) {
formDeptIdSet.add(queryForm.getDeptId());
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(), null));
}
- if(ObjectUtil.isNotEmpty(queryForm.getDeptIds())){
+ if (ObjectUtil.isNotEmpty(queryForm.getDeptIds())) {
for (Long deptId : queryForm.getDeptIds()) {
formDeptIdSet.add(deptId);
- formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId,null));
+ formDeptIdSet.addAll(systemDeptService.getIdsByPid(deptId, null));
}
}
- if(CollUtil.isNotEmpty(formDeptIdSet)){
+ if (CollUtil.isNotEmpty(formDeptIdSet)) {
queryForm.setDeptIds(new ArrayList<>(formDeptIdSet));
}
@@ -1072,7 +1072,46 @@
@Override
public EquipmentInfo getById(Serializable id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
return this.getOne(queryWrapper);
}
+
+ @Override
+ public List listManufacturer() {
+ return this.baseMapper.listManufacturer();
+ }
+
+ @Override
+ public List listCheckOrganization() {
+ return this.baseMapper.listCheckOrganization();
+ }
+
+ public void updateCheckDestination(Long modelId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("model_id", modelId);
+ List equipmentInfos = this.list(queryWrapper);
+ if (CollUtil.isNotEmpty(equipmentInfos)) {
+ List companyIds = equipmentInfos.stream().map(EquipmentInfo::getCompanyId).distinct().collect(Collectors.toList());
+ List> defaultLabs = modelInfoService.getDefaultLabs(companyIds);
+ Map defaultLabMap = new HashMap<>();
+ defaultLabs.forEach(item -> {
+ if (ObjectUtil.isNotEmpty(item.get("default_lab"))) {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), item.get("default_lab").toString());
+ } else {
+ defaultLabMap.put(Long.valueOf(item.get("dept_id").toString()), null);
+ }
+ });
+
+
+ EquipmentModelInfo modelInfo = modelInfoService.getById(modelId);
+ if (ObjectUtil.isNotEmpty(modelInfo.getId())) {
+ String inspectable = modelInfo.getInspectable();
+ for (EquipmentInfo equipmentInfo : equipmentInfos) {
+ String checkDestination = modelInfoService.classifyCheckDestination(defaultLabMap.get(equipmentInfo.getCompanyId()), inspectable);
+ equipmentInfo.setCheckDestination(checkDestination);
+ }
+ this.updateBatchById(equipmentInfos);
+ }
+ }
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 0740af9..eebf79e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -40,10 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,6 +65,14 @@
private final AbstractPermissionContext permissionContext;
private final AbstractDictService dictService;
+ private final static Map inspectableMap = new HashMap<>();
+
+ static {
+ inspectableMap.put("1","西昌可检");
+ inspectableMap.put("2","海口可检");
+ inspectableMap.put("1,2","西昌可检，海口可检");
+ }
+
@Override
@Transactional
public void add(EquipmentModelInfo modelInfo) {
@@ -141,6 +146,9 @@
equipmentModelInfo.setTechnicalTargetList(technicalTargetList.stream().filter(i->equipmentModelInfo.getId().equals(i.getModelId())).collect(Collectors.toList()));
}
DictCodeUtils.convertDictCodeToName(equipmentModelInfo);
+ if(StrUtil.isNotEmpty(equipmentModelInfo.getInspectable())){
+ equipmentModelInfo.setInspectableName(inspectableMap.get(equipmentModelInfo.getInspectable()));
+ }
}catch (Exception e){
log.error(e.getMessage());
}
@@ -154,6 +162,7 @@
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
+ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable());
queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());
queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType());
return queryWrapper;
@@ -182,8 +191,22 @@
@Override
public String defaultCheckDestination(Long modelId, Long companyId) {
- String defaultLab = this.baseMapper.getLabLocation(companyId);
+ String defaultLab = getDefaultLab(companyId);
String inspectable = this.getById(modelId).getInspectable();
+ return classifyCheckDestination(defaultLab,inspectable);
+ }
+
+ public String getDefaultLab(Long companyId){
+ return this.baseMapper.defaultLab(companyId);
+ }
+
+ @Override
+ public List> getDefaultLabs(List companyIds){
+ return this.baseMapper.defaultLabs(companyIds);
+ }
+
+ @Override
+ public String classifyCheckDestination(String defaultLab,String inspectable){
if(StrUtil.isNotEmpty(defaultLab) && StrUtil.isNotEmpty(inspectable)){
if(inspectable.contains(XC_INSPECTABLE) && defaultLab.contains(XC_LAB)){
return CHECK_DESTINATION_METER;
@@ -193,7 +216,7 @@
return CHECK_DESTINATION_DELIVERY;
}
}
- return null;
+ return CHECK_DESTINATION_DELIVERY;
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index 0dc28a0..c5e7b0a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -1,11 +1,23 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.annotation.DictCodeField;
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.casic.missiles.mapper.status.EquipmentBorrowRelationMapper;
+import com.casic.missiles.model.status.EquipmentStatusRelation;
import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.DictCodeUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
*
* 服务实现类
@@ -15,6 +27,41 @@
* @since 2024-02-21
*/
@Service
+@RequiredArgsConstructor
public class EquipmentBorrowRelationServiceImpl extends ServiceImpl implements IEquipmentBorrowRelationService {
+ private ISystemDeptService systemDeptService;
+ @Override
+ public boolean saveByApproval(Long approvalId, List relationList) {
+ this.deleteByApproval(approvalId);
+ if(CollUtil.isNotEmpty(relationList)){
+ relationList.forEach(i->{
+ i.setBorrowId(approvalId);
+ });
+ return this.saveBatch(relationList);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean deleteByApproval(Long approvalId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("borrow_id",approvalId);
+ return this.remove(wrapper);
+ }
+
+ @Override
+ public List selectByApproval(Long approvalId) {
+ List relations = this.baseMapper.selectByBorrow(approvalId);
+ for (EquipmentBorrowRelation relation : relations) {
+ relation.setCompanyName(systemDeptService.getDeptName(relation.getCompanyId()));
+ relation.setDeptName(systemDeptService.getParentsDeptName(relation.getDeptId()));
+ try {
+ DictCodeUtils.convertDictCodeToName(relation);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return relations;
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
index 1b4acf7..2c16ea5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
@@ -1,11 +1,38 @@
package com.casic.missiles.service.impl.status;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
+import com.casic.missiles.dto.subcontract.SubcontractorQueryForm;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.model.equipment.EquipmentInfoApproval;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.casic.missiles.mapper.status.EquipmentBorrowMapper;
+import com.casic.missiles.model.subcontract.Subcontractor;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.service.impl.CommonApprovalServiceImpl;
+import com.casic.missiles.service.status.IEquipmentBorrowRelationService;
import com.casic.missiles.service.status.IEquipmentBorrowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.service.system.ISystemDeptService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.enums.PrefixCodeEnum.EQUIPMENT_STATUS_BORROW_PREFIX;
+import static com.casic.missiles.enums.equipment.StatusApprovalTypeEnum.DELAY;
+import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.EQUIPMENT_BORROW_BEAN_NAME;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_EXTERNAL;
+import static com.casic.missiles.enums.system.ApplyFromIdEnum.EQUIPMENT_BORROW_APPROVAL_INTERNAL;
+
/**
*
* 服务实现类
@@ -14,7 +41,102 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-@Service
-public class EquipmentBorrowServiceImpl extends ServiceImpl implements IEquipmentBorrowService {
+@Service(EQUIPMENT_BORROW_BEAN_NAME)
+@RequiredArgsConstructor
+public class EquipmentBorrowServiceImpl extends CommonApprovalServiceImpl implements IEquipmentBorrowService {
+ private final AbstractPermissionContext permissionContext;
+ private final ISystemDeptService systemDeptService;
+ private final IEquipmentBorrowRelationService relationService;
+
+ public String getFormId(Long borrowDeptId){
+ // todo 有问题：连-连
+ AuthUser authUser = permissionContext.getAuthService().getLoginUser();
+ Long userDeptId = authUser.getDeptId();
+
+ Dept userDept = systemDeptService.getById(userDeptId);
+ Dept borrowDept = systemDeptService.getById(borrowDeptId);
+
+ if(userDept.getPid().equals(borrowDept.getPid())){
+ return EQUIPMENT_BORROW_APPROVAL_INTERNAL.getCode();
+ }else {
+ return EQUIPMENT_BORROW_APPROVAL_EXTERNAL.getCode();
+ }
+ }
+
+ @Override
+ public Long saveOrUpdateApproval(EquipmentBorrow approvalForm) {
+ // 1. 生成统一编号
+ if (StrUtil.isEmpty(approvalForm.getApprovalNo())) {
+ Long maxNo = this.baseMapper.selectMaxNo();
+ approvalForm.setApprovalNo(NumberGeneratorUtil.getContactNo(EQUIPMENT_STATUS_BORROW_PREFIX, maxNo));
+ }
+ // 2. 设置申请状态：草稿箱
+ approvalForm.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+ this.saveOrUpdate(approvalForm);
+
+ relationService.saveByApproval(approvalForm.getId(),approvalForm.getRelationList());
+ // 4. 返回申请记录id
+ return approvalForm.getId();
+
+ }
+
+ @Override
+ public EquipmentBorrow detail(Long approvalId) {
+ EquipmentBorrow borrow = this.getById(approvalId);
+ borrow.setCompanyName(systemDeptService.getDeptName(borrow.getCompanyId()));
+ borrow.setDeptName(systemDeptService.getParentsDeptName(borrow.getDeptId()));
+ borrow.setBorrowDeptName(systemDeptService.getParentsDeptName(borrow.getBorrowDeptId()));
+
+ borrow.setRelationList(relationService.selectByApproval(approvalId));
+ borrow.setEquipmentCount(borrow.getRelationList().size());
+ return borrow;
+ }
+
+ @Override
+ public EquipmentBorrow warpper(EquipmentBorrow obj) {
+ obj.setCompanyName(systemDeptService.getDeptName(obj.getCompanyId()));
+ obj.setDeptName(systemDeptService.getParentsDeptName(obj.getDeptId()));
+ obj.setBorrowDeptName(systemDeptService.getParentsDeptName(obj.getBorrowDeptId()));
+ return super.warpper(obj);
+ }
+
+ @Override
+ public QueryWrapper commonQuery(EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper query = new QueryWrapper<>();
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalNo()),"approval_no",queryForm.getApprovalNo());
+ query.eq(ObjectUtil.isNotEmpty(queryForm.getCompanyId()),"company_id",queryForm.getCompanyId());
+ if(ObjectUtil.isNotEmpty(queryForm.getDeptId())){
+ List deptIds = new ArrayList<>();
+ deptIds.add(queryForm.getDeptId());
+ deptIds.addAll(systemDeptService.getIdsByPid(queryForm.getDeptId(),null));
+ query.in("dept_id",deptIds);
+ }
+ query.like(StrUtil.isNotEmpty(queryForm.getBorrowReason()),"borrow_reason",queryForm.getBorrowReason());
+ query.like(StrUtil.isNotEmpty(queryForm.getApprovalUserName()),"approval_user_name",queryForm.getApprovalUserName());
+ query.ge(StrUtil.isNotEmpty(queryForm.getApprovalTimeStart()), "approval_time", queryForm.getApprovalTimeStart());
+ query.le(StrUtil.isNotEmpty(queryForm.getApprovalTimeEnd()), "approval_time", queryForm.getApprovalTimeEnd());
+
+ return query;
+ }
+
+ @Override
+ public > E page(E page, Wrapper queryWrapper) {
+ List list = this.baseMapper.selectListPage((Page) page, (QueryWrapper) queryWrapper);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public Page allPage(Page page, EquipmentBorrowQueryForm queryForm) {
+ QueryWrapper queryWrapper = commonQuery(queryForm);
+ page = this.page(page,queryWrapper);
+ page.getRecords().forEach(this::warpper);
+ return page;
+ }
+
+ @Override
+ public void setBizNo(EquipmentBorrow obj) {
+ obj.setBizNo(obj.getApprovalNo());
+ }
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
index a59b3ee..a75b088 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowRelationService.java
@@ -3,6 +3,8 @@
import com.casic.missiles.model.status.EquipmentBorrowRelation;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,9 @@
*/
public interface IEquipmentBorrowRelationService extends IService {
+ boolean saveByApproval(Long approvalId, List relationList);
+
+ boolean deleteByApproval(Long approvalId);
+
+ List selectByApproval(Long approvalId);
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
index 0a88522..d05549a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentBorrowService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.service.status;
+import com.casic.missiles.dto.status.EquipmentBorrowQueryForm;
import com.casic.missiles.model.status.EquipmentBorrow;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.status.EquipmentStatusApproval;
+import com.casic.missiles.service.ICommonApprovalService;
/**
*
@@ -11,6 +14,9 @@
* @author zhangyingjie
* @since 2024-02-21
*/
-public interface IEquipmentBorrowService extends IService {
+public interface IEquipmentBorrowService extends ICommonApprovalService {
+ String getFormId(Long borrowDeptId);
+ Long saveOrUpdateApproval(EquipmentBorrow borrowForm);
+ EquipmentBorrow detail(Long approvalId);
}
diff --git a/pom.xml b/pom.xml
index 3c80949..9ba7f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.casic
casic-metering-eqpt-xichang
- 1.3.1.1
+ 1.3.1.2
casic-metering-eqpt-xichang
pom