update: 安全工器具类型优化

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolTypeEntity.java

@@ -51,7 +51,7 @@ public class SafetyToolTypeEntity extends TenantEntity {
 	private Date sendTime;
 
 	@ApiModelProperty(value = "机构id")
-	private Long deptId;
+	private String deptId;
 
 	@ApiModelProperty(value = "机构名称")
 	private String deptName;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java

@@ -137,6 +137,9 @@ public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper,
 			if (StringUtil.isNotBlank(req.getEndSendTime())) {
 				le("send_time", req.getEndSendTime());
 			}
+			if (StringUtil.isNotBlank(req.getDeptId())) {
+				eq("dept_id", req.getDeptId());
+			}
 		}};
 		IPage<SafetyToolTypeEntity> safetyToolTypePages = super.page(Condition.getPage(query), queryWrapper);
 		IPage<SafetyToolTypeVO> pages = new Page<>();
@@ -171,6 +174,9 @@ public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper,
 			if (StringUtil.isNotBlank(param.getEndSendTime())) {
 				le("send_time", param.getEndSendTime());
 			}
+			if (StringUtil.isNotBlank(param.getDeptId())) {
+				eq("dept_id", param.getDeptId());
+			}
 		}};
 		List<SafetyToolTypeEntity> types = this.list(queryWrapper);
 		if(CollectionUtil.isEmpty(types)){

hzims-service/safeproduct/src/main/resources/db/3.0.0.sql

@@ -10,5 +10,5 @@ ALTER TABLE `hzims_risk_hazard_task`
     ADD COLUMN `remark` text NULL ;
 
 ALTER TABLE `hzims_safe_safety_tool_type`
-    ADD COLUMN `dept_id` bigint(20) DEFAULT NULL COMMENT '机构id',
+    ADD COLUMN `dept_id` varchar(50) DEFAULT NULL COMMENT '机构id',
-    ADD COLUMN `dept_name` varchar(20) DEFAULT NULL COMMENT '机构名称';
+    ADD COLUMN `dept_name` varchar(50) DEFAULT NULL COMMENT '机构名称';