init: init project step4: biz code support 2 (user dept menu)

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/constant/enums/CommonFlag.java

@@ -20,9 +20,9 @@ public class CommonFlag {
 		LOCKED("LOCKED", 1, "锁定"),
 		DELETED("DELETED", 9, "删除");
 
+		@EnumValue
 		private final String type;
 
-		@EnumValue
 		private final Integer code;
 
 		private final String description;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -14,275 +14,275 @@ import lombok.Getter;
  */
 public final class UpmsType {
 
-	private UpmsType() {
-	}
-
-	/**
-	 * 任务大类
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum TaskCategory {
-
-		FORWARD("FORWARD", "转发类任务"),
-		CONFERENCES_INTERVIEWS("CONFERENCES_INTERVIEWS", "会议与专访"),
-		CUSTOMER_VISIT("CUSTOMER_VISIT", "客户拜访"),
-		MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", "市场信息搜集"),
-		SCORE_LIMIT("SCORE_LIMIT", "积分限制");
-
-		@EnumValue
-		private final String type;
-
-		private final String description;
-
-
-	}
-
-
-	/**
-	 * 任务二级分类
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum TaskSubCategory {
-
-		PRODUCT_ALBUM("PRODUCT_ALBUM", TaskCategory.FORWARD, "产品相册"),
-		ACADEMIC_INFO_EXCHANGE("ACADEMIC_INFO_EXCHANGE", TaskCategory.FORWARD, "学术信息交流"),
-		CONFERENCE("CONFERENCE", TaskCategory.CONFERENCES_INTERVIEWS, "会议举办"),
-		ONE_ON_ONE_INTERVIEW("ONE_ON_ONE_INTERVIEW", TaskCategory.CONFERENCES_INTERVIEWS, "一对一专访"),
-		TRAINING("TRAINING", TaskCategory.CONFERENCES_INTERVIEWS, "培训"),
-		BUSINESS_COMPANY_VISIT("BUSINESS_COMPANY_VISIT", TaskCategory.CUSTOMER_VISIT, "商业公司拜访"),
-		HOSPITAL_VISIT("HOSPITAL_VISIT", TaskCategory.CUSTOMER_VISIT, "医院拜访"),
-		PHARMACY_VISIT("PHARMACY_VISIT", TaskCategory.CUSTOMER_VISIT, "药店拜访"),
-		INVENTORY_INFO_COLLECTION("INVENTORY_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "库存信息搜集"),
-		HOSPITAL_INFO_COLLECTION("HOSPITAL_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "医院信息搜集"),
-		SCORE_LIMIT("SCORE_LIMIT", TaskCategory.SCORE_LIMIT, "积分限制"),
-		MONTH_SCORE_LIMIT("MONTH_SCORE_LIMIT", TaskCategory.SCORE_LIMIT, "每月积分限制");
-
-		@EnumValue
-		private final String type;
-
-		private final TaskCategory category;
-
-		private final String description;
-
-	}
-
-	/**
-	 * 任务二级分类2
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum TaskSubCategory2 {
-
-//		PRODUCT_ALBUM("PRODUCT_ALBUM", TaskCategory.FORWARD, "产品相册"),
-		ACADEMIC_INFO_EXCHANGE("ACADEMIC_INFO_EXCHANGE", TaskCategory.FORWARD, "学术信息交流"),
-		CONFERENCE("CONFERENCE", TaskCategory.CONFERENCES_INTERVIEWS, "会议举办"),
-		ONE_ON_ONE_INTERVIEW("ONE_ON_ONE_INTERVIEW", TaskCategory.CONFERENCES_INTERVIEWS, "一对一专访"),
-		TRAINING("TRAINING", TaskCategory.CONFERENCES_INTERVIEWS, "培训"),
-//		BUSINESS_COMPANY_VISIT("BUSINESS_COMPANY_VISIT", TaskCategory.CUSTOMER_VISIT, "商业公司拜访"),
+    private UpmsType() {
+    }
+
+    /**
+     * 任务大类
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum TaskCategory {
+
+        FORWARD("FORWARD", "转发类任务"),
+        CONFERENCES_INTERVIEWS("CONFERENCES_INTERVIEWS", "会议与专访"),
+        CUSTOMER_VISIT("CUSTOMER_VISIT", "客户拜访"),
+        MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", "市场信息搜集"),
+        SCORE_LIMIT("SCORE_LIMIT", "积分限制");
+
+        @EnumValue
+        private final String type;
+
+        private final String description;
+
+
+    }
+
+
+    /**
+     * 任务二级分类
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum TaskSubCategory {
+
+        PRODUCT_ALBUM("PRODUCT_ALBUM", TaskCategory.FORWARD, "产品相册"),
+        ACADEMIC_INFO_EXCHANGE("ACADEMIC_INFO_EXCHANGE", TaskCategory.FORWARD, "学术信息交流"),
+        CONFERENCE("CONFERENCE", TaskCategory.CONFERENCES_INTERVIEWS, "会议举办"),
+        ONE_ON_ONE_INTERVIEW("ONE_ON_ONE_INTERVIEW", TaskCategory.CONFERENCES_INTERVIEWS, "一对一专访"),
+        TRAINING("TRAINING", TaskCategory.CONFERENCES_INTERVIEWS, "培训"),
+        BUSINESS_COMPANY_VISIT("BUSINESS_COMPANY_VISIT", TaskCategory.CUSTOMER_VISIT, "商业公司拜访"),
+        HOSPITAL_VISIT("HOSPITAL_VISIT", TaskCategory.CUSTOMER_VISIT, "医院拜访"),
+        PHARMACY_VISIT("PHARMACY_VISIT", TaskCategory.CUSTOMER_VISIT, "药店拜访"),
+        INVENTORY_INFO_COLLECTION("INVENTORY_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "库存信息搜集"),
+        HOSPITAL_INFO_COLLECTION("HOSPITAL_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "医院信息搜集"),
+        SCORE_LIMIT("SCORE_LIMIT", TaskCategory.SCORE_LIMIT, "积分限制"),
+        MONTH_SCORE_LIMIT("MONTH_SCORE_LIMIT", TaskCategory.SCORE_LIMIT, "每月积分限制"),
+        ADVERSE_REACTION_COLLECTION("ADVERSE_REACTION_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "不良反应收集");
+
+        @EnumValue
+        private final String type;
+
+        private final TaskCategory category;
+
+        private final String description;
+
+    }
+
+    /**
+     * 任务二级分类2
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum TaskSubCategory2 {
+
+        //		PRODUCT_ALBUM("PRODUCT_ALBUM", TaskCategory.FORWARD, "产品相册"),
+        ACADEMIC_INFO_EXCHANGE("ACADEMIC_INFO_EXCHANGE", TaskCategory.FORWARD, "学术信息交流"),
+        CONFERENCE("CONFERENCE", TaskCategory.CONFERENCES_INTERVIEWS, "会议举办"),
+        ONE_ON_ONE_INTERVIEW("ONE_ON_ONE_INTERVIEW", TaskCategory.CONFERENCES_INTERVIEWS, "一对一专访"),
+        TRAINING("TRAINING", TaskCategory.CONFERENCES_INTERVIEWS, "培训"),
+        //		BUSINESS_COMPANY_VISIT("BUSINESS_COMPANY_VISIT", TaskCategory.CUSTOMER_VISIT, "商业公司拜访"),
 //		HOSPITAL_VISIT("HOSPITAL_VISIT", TaskCategory.CUSTOMER_VISIT, "医院拜访"),
 //		PHARMACY_VISIT("PHARMACY_VISIT", TaskCategory.CUSTOMER_VISIT, "药店拜访"),
-		INVENTORY_INFO_COLLECTION("INVENTORY_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "库存信息搜集"),
-		HOSPITAL_INFO_COLLECTION("HOSPITAL_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "医院信息搜集"),
-		CUSTOMER_VISIT("CUSTOMER_VISIT", TaskCategory.CUSTOMER_VISIT, "客户拜访"),
-		PRODUCT_PROMOTION("PRODUCT_PROMOTION", TaskCategory.FORWARD, "产品推广"),
-		MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "市场信息搜集"),
-		SPECIAL_SERVICE("SPECIAL_SERVICE", null, "专项服务"),
-		BUSINESS_COMPANY_CUSTOMER_MANAGEMENT("BUSINESS_COMPANY_CUSTOMER_MANAGEMENT", null, "商业公司客户管理"),
-		AGENT_CUSTOMER_MANAGEMENT("AGENT_CUSTOMER_MANAGEMENT", null, "代理商客户管理"),
-		ENT_TASK("ENT_TASK", null, "企业任务"),
-		TASK_TYPE_CONFIG("TASK_TYPE_CONFIG", null, "任务类型配置");
-
-
-
-		@EnumValue
-		private final String type;
-
-		private final TaskCategory category;
-
-		private final String description;
-
-	}
-
-	// 企业类型
-	@Getter
-	@AllArgsConstructor
-	public enum EnterpriseType {
-
-		CMO("CMO", "药企"),
-		CSO("CSO", "CSO"),
-		NET_MED("NET_MED", "互联网医疗"),
-		MED_MED("MED_MED", "医学传媒"),
-		MEETING("MEETING", "科室会");
-
-		@EnumValue
-		private final String type;
-		private final String description;
-	}
-
-	// 产品线
-	@Getter
-	@AllArgsConstructor
-	public enum ProductLine {
-
-		CSO1("CSO1", "CSO1"),
-		CSO2("CSO2", "CSO2"),
-		HCP1("HCP1", "HCP1"),
-		HCP2("HCP2", "HCP2"),
-		HCP3("HCP3", "HCP3"),
-		HCP4("HCP4", "HCP4");
-
-		@EnumValue
-		private final String type;
-		private final String description;
-	}
-
-	/**
-	 * 终止积分包类型
-	 *
-	 * @author lixuesong
-	 * @date 2023/08/28
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum TerminatePackageType {
-		ALL("ALL", "1", "全部终止"),
-		REMAIN("REMAIN", "2", "剩余回收");
-
-		@EnumValue
-		private final String type;
-		private final String enableType;
-		private final String description;
-
-		/**
-		 * 根据enableType返回枚举
-		 *
-		 * @param enableType 终止类型
-		 * @return {@link TerminatePackageType}
-		 */
-		public static TerminatePackageType getByEnableType(String enableType) {
-			if ("1".equals(enableType)) {
-				return ALL;
-			} else if ("2".equals(enableType)) {
-				return REMAIN;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * MAH结算-步进状态
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum MahSettleStep {
-		BUSINESS("BUSINESS", "业务"),
-		FINANCE("FINANCE", "财务");
-
-		@EnumValue
-		private final String type;
-		private final String description;
-	}
-
-	/**
-	 * 业务未读提醒
-	 *
-	 * @author lixuesong
-	 * @date 2023/10/25
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum BizReminderType {
-		ASSIGN_POINTS_OTHER_REMINDER("ASSIGN_POINTS_OTHER_REMINDER", "ASSIGN:POINTS:OTHE:REMINDER:KEY", "个人承接积分值-其他的提醒");
-
-		@EnumValue
-		private final String type;
-		private final String key;
-		private final String description;
-	}
-
-	/**
-	 * 药店类型
-	 *
-	 * @author lixuesong
-	 * @date 2023/11/27
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum PharmacyType {
-		ORDINARY("ORDINARY", "普通药店"),
-		CHAIN("CHAIN", "连锁药房");
-
-		/**
-		 * 药店类型
-		 */
-		@EnumValue
-		private final String type;
-
-		/**
-		 * 描述
-		 */
-		private final String description;
-
-		public static PharmacyType getByDescription(String description) {
-			for (PharmacyType type : PharmacyType.values()) {
-				if (StrUtil.equals(type.getDescription(), description)) {
-					return type;
-				}
-			}
-
-			return null;
-		}
-	}
-
-	/**
-	 * 模板类型
-	 *
-	 * @author lixuesong
-	 * @date 2023/12/05
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum TemplateType {
-
-		TEMPLATE1("TEMPLATE1", "模板1"),
-		TEMPLATE2("TEMPLATE2", "模板2");
-
-		/**
-		 * 类型
-		 */
-		@EnumValue
-		private final String type;
-
-		/**
-		 * 描述
-		 */
-		private final String description;
-	}
-
-	/**
-	 * 财务复核方式
-	 *
-	 * @author lixuesong
-	 * @date 2024/01/05
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum FinancialReviewType {
-		AUTO("AUTO", "自动"),
-		MANUAL("MANUAL", "手动");
-
-		/**
-		 * 类型
-		 */
-		@EnumValue
-		private final String type;
-
-		/**
-		 * 描述
-		 */
-		private final String description;
-
-	}
+        INVENTORY_INFO_COLLECTION("INVENTORY_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "库存信息搜集"),
+        HOSPITAL_INFO_COLLECTION("HOSPITAL_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "医院信息搜集"),
+        CUSTOMER_VISIT("CUSTOMER_VISIT", TaskCategory.CUSTOMER_VISIT, "客户拜访"),
+        PRODUCT_PROMOTION("PRODUCT_PROMOTION", TaskCategory.FORWARD, "产品推广"),
+        MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "市场信息搜集"),
+        SPECIAL_SERVICE("SPECIAL_SERVICE", null, "专项服务"),
+        BUSINESS_COMPANY_CUSTOMER_MANAGEMENT("BUSINESS_COMPANY_CUSTOMER_MANAGEMENT", null, "商业公司客户管理"),
+        AGENT_CUSTOMER_MANAGEMENT("AGENT_CUSTOMER_MANAGEMENT", null, "代理商客户管理"),
+        ENT_TASK("ENT_TASK", null, "企业任务"),
+        TASK_TYPE_CONFIG("TASK_TYPE_CONFIG", null, "任务类型配置");
+
+
+        @EnumValue
+        private final String type;
+
+        private final TaskCategory category;
+
+        private final String description;
+
+    }
+
+    // 企业类型
+    @Getter
+    @AllArgsConstructor
+    public enum EnterpriseType {
+
+        CMO("CMO", "药企"),
+        CSO("CSO", "CSO"),
+        NET_MED("NET_MED", "互联网医疗"),
+        MED_MED("MED_MED", "医学传媒"),
+        MEETING("MEETING", "科室会");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    // 产品线
+    @Getter
+    @AllArgsConstructor
+    public enum ProductLine {
+
+        CSO1("CSO1", "CSO1"),
+        CSO2("CSO2", "CSO2"),
+        HCP1("HCP1", "HCP1"),
+        HCP2("HCP2", "HCP2"),
+        HCP3("HCP3", "HCP3"),
+        HCP4("HCP4", "HCP4");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    /**
+     * 终止积分包类型
+     *
+     * @author lixuesong
+     * @date 2023/08/28
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum TerminatePackageType {
+        ALL("ALL", "1", "全部终止"),
+        REMAIN("REMAIN", "2", "剩余回收");
+
+        @EnumValue
+        private final String type;
+        private final String enableType;
+        private final String description;
+
+        /**
+         * 根据enableType返回枚举
+         *
+         * @param enableType 终止类型
+         * @return {@link TerminatePackageType}
+         */
+        public static TerminatePackageType getByEnableType(String enableType) {
+            if ("1".equals(enableType)) {
+                return ALL;
+            } else if ("2".equals(enableType)) {
+                return REMAIN;
+            }
+            return null;
+        }
+    }
+
+    /**
+     * MAH结算-步进状态
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum MahSettleStep {
+        BUSINESS("BUSINESS", "业务"),
+        FINANCE("FINANCE", "财务");
+
+        @EnumValue
+        private final String type;
+        private final String description;
+    }
+
+    /**
+     * 业务未读提醒
+     *
+     * @author lixuesong
+     * @date 2023/10/25
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum BizReminderType {
+        ASSIGN_POINTS_OTHER_REMINDER("ASSIGN_POINTS_OTHER_REMINDER", "ASSIGN:POINTS:OTHE:REMINDER:KEY", "个人承接积分值-其他的提醒");
+
+        @EnumValue
+        private final String type;
+        private final String key;
+        private final String description;
+    }
+
+    /**
+     * 药店类型
+     *
+     * @author lixuesong
+     * @date 2023/11/27
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum PharmacyType {
+        ORDINARY("ORDINARY", "普通药店"),
+        CHAIN("CHAIN", "连锁药房");
+
+        /**
+         * 药店类型
+         */
+        @EnumValue
+        private final String type;
+
+        /**
+         * 描述
+         */
+        private final String description;
+
+        public static PharmacyType getByDescription(String description) {
+            for (PharmacyType type : PharmacyType.values()) {
+                if (StrUtil.equals(type.getDescription(), description)) {
+                    return type;
+                }
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * 模板类型
+     *
+     * @author lixuesong
+     * @date 2023/12/05
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum TemplateType {
+
+        TEMPLATE1("TEMPLATE1", "模板1"),
+        TEMPLATE2("TEMPLATE2", "模板2");
+
+        /**
+         * 类型
+         */
+        @EnumValue
+        private final String type;
+
+        /**
+         * 描述
+         */
+        private final String description;
+    }
+
+    /**
+     * 财务复核方式
+     *
+     * @author lixuesong
+     * @date 2024/01/05
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum FinancialReviewType {
+        AUTO("AUTO", "自动"),
+        MANUAL("MANUAL", "手动");
+
+        /**
+         * 类型
+         */
+        @EnumValue
+        private final String type;
+
+        /**
+         * 描述
+         */
+        private final String description;
+
+    }
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/HuiqiyunInputRecord.java

@@ -1,45 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 汇企云回调异步通知记录
- * @TableName huiqiyun_input_record
- */
-@TableName(value ="huiqiyun_input_record")
-@Data
-public class HuiqiyunInputRecord extends Model<HuiqiyunInputRecord> {
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     *  报文流水号
-     */
-    private String reqMsgId;
-
-    /**
-     * 请求body
-     */
-    private String reqBody;
-
-	/**
-	 * 解密后的body
-	 */
-	private String decryptBody;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/LingcaiaiInputRecord.java

@@ -1,62 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * @author: lixuesong
- * @createTime: 2022/10/27 11:20
- * @description: 浪潮(灵才接好活)结算回调记录
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "lingcaiai_input_record")
-public class LingcaiaiInputRecord extends Model<LingcaiaiInputRecord> {
-
-	/**
-	 * 主键id
-	 */
-	@TableId(type = IdType.AUTO)
-	private Integer id;
-
-	/**
-	 * 签名
-	 */
-	private String verify;
-
-	/**
-	 * 通知类型
-	 */
-	private String channel;
-
-	/**
-	 * 请求body内容
-	 */
-	private String reqBody;
-
-	/**
-	 * 项目单号
-	 */
-	private String batchNo;
-
-	/**
-	 * 账号单号
-	 */
-	private String accountNo;
-
-	/**
-	 * 订单状态（0未支付，1已支付，2已取消）
-	 */
-	private Integer orderStatus;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/OladingInputRecord.java

@@ -1,56 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 自由职家请求记录实体
- *
- * @author lixuesong
- * @date 2022年04月18日 15:33
- */
-@Data
-public class OladingInputRecord extends Model<OladingInputRecord> {
-
-	private static final long serialVersionUID = 8128442024567142412L;
-
-	/**
-	 * 主键id
-	 */
-	@TableId(type = IdType.AUTO)
-	private Integer id;
-
-	/**
-	 * 请求流水号
-	 */
-	private String requestId;
-
-	/**
-	 * 请求接口名称
-	 */
-	private String interfaceName;
-
-	/**
-	 * 请求body内容
-	 */
-	private String reqBody;
-
-	/**
-	 * 请求公钥
-	 */
-	private String publicKey;
-
-	/**
-	 * 请求时私钥
-	 */
-	private String privateKey;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/PartyAEncryptedInputRecord.java

@@ -1,68 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * {@code PartyAEncryptedInputRecord} 甲方请求加密信息记录实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2021-05-31
- * @since ver.1.0.0
- */
-@Data
-public class PartyAEncryptedInputRecord implements Serializable {
-	/**
-	 * id
-	 */
-	private Integer id;
-
-	/**
-	 * 主体id
-	 */
-	private Integer deptId;
-
-	/**
-	 * 请求时服务器公钥
-	 */
-	private String serPublicKey;
-
-	/**
-	 * 请求时服务器私钥
-	 */
-	private String serPrivateKey;
-
-	/**
-	 * 请求时客户端公钥
-	 */
-	private String cliPublicKey;
-
-	/**
-	 * 请求时客户端私钥
-	 */
-	private String cliPrivateKey;
-
-	/**
-	 * 请求时签名字符串
-	 */
-	private String signature;
-
-	/**
-	 * 加密后的信息
-	 */
-	private String originalText;
-
-	/**
-	 * 密文密码
-	 */
-	private String password;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/PartyBEncryptedOutputRecord.java

@@ -1,73 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * {@code PartyBEncryptedOutputRecord} 乙方响应加密信息记录实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2021-05-31
- * @since ver.1.0.0
- */
-@Data
-public class PartyBEncryptedOutputRecord implements Serializable {
-	/**
-     * id
-	 */
-	private Integer id;
-
-	/**
-	 * 主体id
-	 */
-	private Integer deptId;
-
-	/**
-	 * 请求时服务器公钥
-	 */
-	private String serPublicKey;
-
-	/**
-	 * 请求时服务器私钥
-	 */
-	private String serPrivateKey;
-
-	/**
-	 * 请求时客户端公钥
-	 */
-	private String cliPublicKey;
-
-	/**
-	 * 请求时客户端私钥
-	 */
-	private String cliPrivateKey;
-
-	/**
-	 * 请求时签名字符串
-	 */
-	private String signature;
-
-	/**
-	 * 加密后的信息
-	 */
-	private String originalText;
-
-	/**
-	 * 密文密码
-	 */
-	private String password;
-
-	/**
-	 * 请求id
-	 */
-	private Integer inputId;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SettleNoteWarrantParams.java

@@ -1,36 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * {@code SettleNoteWarrantParams}
- *
- * <p>
- * 结算短信通知参数
- * </p>
- *
- * @author jimmy
- * @version 1.0.0
- * @date 2022/03/24 11:40
- */
-@Data
-@ToString
-public class SettleNoteWarrantParams implements Serializable {
-	private static final long serialVersionUID = 7210920198551076997L;
-
-	private String username;
-
-	private String realname;
-
-	private String bankCard;
-
-	private String deptPermissions;
-
-	private String scorePackageName;
-
-	private String settleAmount;
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptInvoice.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptInvoice.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.feign;
+package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptInvoiceRelation.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptInvoiceRelation.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.feign;
+package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptRecharge.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptRecharge.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.feign;
+package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptRechargeRecord.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptRechargeRecord.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.feign;
+package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptRelation.java

@@ -1,8 +1,9 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -13,19 +14,19 @@ import lombok.EqualsAndHashCode;
  * @since 2018-01-22
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class SysDeptRelation extends Model<SysDeptRelation> {
+@TableName(value = "sys_dept_relation")
+public class SysDeptRelation implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 祖先节点
-	 */
-	private Integer ancestor;
+    /**
+     * 祖先节点
+     */
+    private Integer ancestor;
 
-	/**
-	 * 后代节点
-	 */
-	private Integer descendant;
+    /**
+     * 后代节点
+     */
+    private Integer descendant;
 
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaAgent.java

@@ -40,14 +40,17 @@ public class WmDaAgent implements Serializable {
      * 营业执照
      */
     private String yyzz;
+
     /**
      * 社保缴纳证明
      */
     private String sbjnzm;
+
     /**
      * 法人身份证证明-正面
      */
     private String frsfzzmZm;
+
     /**
      * 法人身份证证明-背面
      */

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDeptTaskTypeConfig.java

@@ -1,11 +1,11 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,13 +16,14 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("wm_dept_task_type_config")
-@EqualsAndHashCode(callSuper = true)
-public class WmDeptTaskTypeConfig extends Model<WmDeptTaskTypeConfig> {
+public class WmDeptTaskTypeConfig implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 主键id
 	 */
-	@TableId
+	@TableId(type = IdType.AUTO)
 	private Integer id;
 
 	/**

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmSettleAccountReceive.java

@@ -1,37 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author zhangwt
- * @date 2021-02-01 18:06:37
- */
-@Data
-@TableName("wm_settle_account_receive")
-@EqualsAndHashCode(callSuper = true)
-public class WmSettleAccountReceive extends Model<WmSettleAccountReceive> {
-	private static final long serialVersionUID = 1L;
-	
-	@TableId
-	private Integer id;
-
-	private String accountName;
-
-	private String accountNo;
-
-	private String opType;
-
-	private String amount;
-
-	private String bankSerialNo;
-
-	private String explore1;
-
-	private String explore2;
-
-	private String explore3;
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTaskSubmissionRule.java

@@ -23,7 +23,6 @@ import java.util.Map;
  * @date 2022-08-15 14:50
  */
 @Data
-@ToString
 @TableName(value = "wm_task_sub_rule", autoResultMap = true)
 public class WmTaskSubmissionRule implements Serializable {
 	private static final long serialVersionUID = -3042306831006555056L;
@@ -71,7 +70,6 @@ public class WmTaskSubmissionRule implements Serializable {
 	 * 提交规则实体
 	 */
 	@Data
-	@ToString
 	public static class SubmissionRule implements Serializable {
 
 		private static final long serialVersionUID = -9205151158528196927L;
@@ -96,7 +94,6 @@ public class WmTaskSubmissionRule implements Serializable {
 		 */
 		private Boolean multiple;
 
-
 	}
 
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTaskType.java

@@ -66,7 +66,7 @@ private static final long serialVersionUID = 1L;
     /**
      * 组织机构ID
      */
-    private String deptId;
+    private Integer deptId;
     /**
      * 是否删除
      */

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/XinbadaInputRecord.java

@@ -1,85 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * 正启之星请求记录
- *
- * @TableName xinbada_input_record
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "xinbada_input_record")
-public class XinbadaInputRecord extends Model<XinbadaInputRecord> {
-	private static final long serialVersionUID = 449846002723578161L;
-
-	/**
-	 * 主键id
-	 */
-	@TableId(type = IdType.AUTO)
-	private Integer id;
-
-	/**
-	 * 签名
-	 */
-	private String signature;
-
-	/**
-	 * 通知类型
-	 */
-	private String actionName;
-
-	/**
-	 * 请求body内容
-	 */
-	private String reqBody;
-
-	/**
-	 * 订单编号唯一
-	 */
-	private String orderUuid;
-
-	/**
-	 * 订单状态
-	 */
-	private Integer orderStatus;
-
-	/**
-	 *
-	 */
-	private String orderNo;
-
-	/**
-	 *
-	 */
-	private String customerUserUuid;
-
-	/**
-	 *
-	 */
-	private String serverUserUuid;
-
-	/**
-	 * 请求公钥
-	 */
-	private String publicKey;
-
-	/**
-	 * 请求时私钥
-	 */
-	private String privateKey;
-
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/XinshiyiInputRecord.java

@@ -1,53 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 薪事易回调异步通知记录
- * @TableName xinshiyi_input_record
- */
-@TableName(value ="xinshiyi_input_record")
-@Data
-public class XinshiyiInputRecord implements Serializable {
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 请求序号
-     */
-    private String reqId;
-
-    /**
-     * 批次号
-     */
-    private String batchId;
-
-	/**
-	 * 消息接口名称
-	 */
-	private String msgMethod;
-
-    /**
-     * 订单状态
-     */
-    private Integer orderStatus;
-
-    /**
-     * 请求body
-     */
-    private String reqBody;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/ZhongyiyunInputRecord.java

@@ -1,71 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 众蚁云回调异步通知记录
- * @TableName zhongyiyun_input_record
- */
-@Data
-@TableName(value ="zhongyiyun_input_record")
-public class ZhongyiyunInputRecord implements Serializable {
-
-	private static final long serialVersionUID = -1449330958713284749L;
-	/**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 请求业务类型
-     */
-    private String reqType;
-
-    /**
-     * 请求序号
-     */
-    private String reqId;
-
-    /**
-     * 请求body
-     */
-    private String reqBody;
-
-    /**
-     * 解密后的body
-     */
-    private String decryptBody;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-	@Getter
-	@AllArgsConstructor
-	public enum ReqType {
-		SIGN_NOTIFY("SIGN_NOTIFY", "签约回调"),
-		SETTLE_NOTIFY("SETTLE_NOTIFY", "结算回调");
-
-		/**
-		 * 请求类型
-		 */
-		@EnumValue
-		private final String type;
-
-		/**
-		 * 描述
-		 */
-		private final String desc;
-	}
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/ZhongzhiInputRecord.java

@@ -1,70 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 中智回调异步通知记录
- * @TableName zhongzhi_input_record
- */
-@TableName(value ="zhongzhi_input_record")
-@Data
-public class ZhongzhiInputRecord implements Serializable {
-
-	private static final long serialVersionUID = 2315253613947884869L;
-
-	/**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 请求业务类型
-     */
-    private String reqType;
-
-    /**
-     * 三方订单号
-     */
-	@TableField(value = "order_no")
-    private String thirdOrderNo;
-
-    /**
-     * 请求body
-     */
-    private String reqBody;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-	@Getter
-	@AllArgsConstructor
-	public enum ReqType {
-//		SIGN_NOTIFY("SIGN_NOTIFY", "签约回调"),
-		SETTLE_NOTIFY("SETTLE_NOTIFY", "结算回调");
-
-		/**
-		 * 请求类型
-		 */
-		@EnumValue
-		private final String type;
-
-		/**
-		 * 描述
-		 */
-		private final String desc;
-	}
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/WmTaskTypeDeptOutput.java

@@ -13,7 +13,7 @@ public class WmTaskTypeDeptOutput {
 	/**
 	 * 任务ID
 	 */
-	private String durgentId;
+	private Integer durgentId;
 
 	private String level1Id;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/SequenceConfig.java

@@ -47,4 +47,15 @@ public class SequenceConfig {
 	public Sequence taskSequence(SequenceSnowflakeProperties properties) {
 		return SnowflakeSeqBuilder.create().datacenterId(properties.getDatacenterId()).workerId(properties.getWorkerId()).build();
 	}
+
+	/**
+	 * 企业
+	 *
+	 * @param properties 参数
+	 * @return 发号器
+	 */
+	@Bean(name = "entSequence")
+	public Sequence entSequence(SequenceSnowflakeProperties properties) {
+		return SnowflakeSeqBuilder.create().datacenterId(properties.getDatacenterId()).workerId(properties.getWorkerId()).build();
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptInvoiceController.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptInvoiceRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptInvoiceService;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceRelationVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceVO;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptRechargeController.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptRechargeRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptInvoiceService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRechargeRecordService;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -91,7 +91,7 @@ public class WmDaAgentController {
      *
      * @param page      分页对象
      * @param wmDaAgent 档案-代理商
-     * @return
+     * @return 分页结果
      */
     @GetMapping("/page")
 //    @PreAuthorize("@pms.hasPermission('admin_wmdaagent_view')" )
@@ -300,7 +300,7 @@ public class WmDaAgentController {
                             newOne.setTaskTypeLevel("2");
                             newOne.setRuleId("" + wmTaskTypeEntRef.getDrugentId() + wmTaskTypeEntRef.getAgentId());
                             newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-                            newOne.setDeptId(wmDaAgent.getDeptId().toString());
+                            newOne.setDeptId(wmDaAgent.getDeptId());
                             newOne.setCreateTime(LocalDateTime.now());
                             newOne.setStatus("0");
                             newOne.setBaseId(wmTaskType1.getId());
@@ -334,7 +334,7 @@ public class WmDaAgentController {
                         newOne.setTaskTypeLevel("2");
                         newOne.setTaskEntId(wmTaskTypeEntRef1.getAgentId());
                         newOne.setRuleId(wmTaskTypeEntRef1.getAgentId().toString());
-                        newOne.setDeptId(wmDaAgent.getDeptId() + "");
+                        newOne.setDeptId(wmDaAgent.getDeptId());
                         newOne.setCreateTime(LocalDateTime.now());
                         newOne.setStatus("0");
                         newOne.setBaseId(wmTaskType2.getId());
@@ -363,7 +363,7 @@ public class WmDaAgentController {
                         newOne.setTaskTypeLevel("2");
                         newOne.setTaskEntId(wmDaAgent.getId());
                         newOne.setRuleId(wmDaAgent.getId().toString());
-                        newOne.setDeptId(String.valueOf(wmDaAgent.getDeptId()));
+                        newOne.setDeptId(wmDaAgent.getDeptId());
                         newOne.setCreateTime(LocalDateTime.now());
                         newOne.setStatus("0");
                         newOne.setBaseId(wmTaskType2.getId());
@@ -422,7 +422,7 @@ public class WmDaAgentController {
                     newOne.setTaskTypeLevel("2");
                     newOne.setRuleId("" + wmTaskTypeEntRef.getDrugentId() + wmTaskTypeEntRef.getAgentId());
                     newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-                    newOne.setDeptId(list3.get(0).getDeptId() + "");
+                    newOne.setDeptId(list3.get(0).getDeptId());
                     newOne.setCreateTime(LocalDateTime.now());
                     newOne.setStatus("0");
                     newOne.setBaseId(wmTaskType1.getId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDrugEntController.java

@@ -1,6 +1,7 @@
 
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
@@ -20,6 +21,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,204 +43,200 @@ import java.util.stream.Collectors;
  * @author gaoyanng
  * @date 2020-06-25 23:35:42
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wmdadrugent")
 public class WmDaDrugEntController {
 
-	private final WmDaDrugEntService wmDaDrugEntService;
-	private final WmDaAgentService wmDaAgentService;
-	private final SysUserService userService;
-	private final SysDeptService sysDeptService;
-	private final WmTaskTypeEntRefMapper wmTaskTypeEntRefMapper;
-	private final WmTaskTypeMapper wmTaskTypeMapper;
-	private final SysDeptMapper sysDeptMapper;
-	private final SysUserMapper sysUserMapper;
-	private final SysCsmUserRelationService sysCsmUserRelationService;
-	private final SysDeptCsmMapper sysDeptCsmMapper;
-	private final RedisTemplate redisTemplate;
-
-	/**
-	 * 分页查询
-	 *
-	 * @param page        分页对象
-	 * @param wmDaDrugEnt 档案-药企
-	 * @return
-	 */
-	@GetMapping("/page")
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
-	public R getWmDaDrugEntPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
-		if (SecurityUtils.getRoles().contains(19)) {
-			// CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
-			Integer userId = SecurityUtils.getUser().getId();
-			// 递归查询下属关联的userId
-			Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
-			wmDaDrugEnt.setCsmUserIdList(allUserIds);
-		}
-
-		return R.ok(wmDaDrugEntService.selectPage(page, wmDaDrugEnt));
-	}
-
-
-	/**
-	 * 通过id查询档案-药企
-	 *
-	 * @param id id
-	 * @return R
-	 */
-	@GetMapping("/{id}")
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
-	public R getById(@PathVariable("id") Integer id) {
-		return R.ok(wmDaDrugEntService.getById(id));
-	}
-
-
-	/**
-	 * @Modify: start
-	 * @Version: v2021.4.16
-	 * @Author: ryz
-	 * @Date: 2021/5/26  弃用
-	*/
-	/**
-	 * 新增档案-药企
-	 *
-	 * @param wmDaDrugEnt 档案-药企
-	 * @return R
-	 */
-	@SysLog("新增档案-药企")
-	@PostMapping
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
-	public R save(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
-
-		WmDaDrugEnt query = new WmDaDrugEnt();
-		query.setEntname(wmDaDrugEnt.getEntname());
-		List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
-
-		if (list.size() > 0) {
-			return R.failed("药企公司名称已存在");
-		}
-
-		wmDaDrugEnt.setCreateTime(LocalDateTime.now());
-		return R.ok(wmDaDrugEntService.saveDrugEnt(wmDaDrugEnt));
-	}
-
-
-	/**
-	 * 新增档案-药企
-	 *
-	 * @param wmDaDrugEnt 档案-药企
-	 * @return R
-	 */
-	@SysLog("新增档案-药企")
-	@PostMapping("saves")
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
-	@Transactional(rollbackFor = Exception.class)
-	public R saves(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
-
-		WmDaDrugEnt query = new WmDaDrugEnt();
-		query.setEntname(wmDaDrugEnt.getEntname());
-		List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
-
-		if (list.size() > 0) {
-			return R.failed("药企公司名称已存在");
-		}
-
-		WmDaDrugEnt query1 = new WmDaDrugEnt();
-		query1.setEntcode(wmDaDrugEnt.getEntcode());
-		List<WmDaDrugEnt> list1 = wmDaDrugEntService.list(Wrappers.query(query1));
-
-		if (list1.size() > 0) {
-			return R.failed("统一社会信用代码已经存在");
-		}
-
-		wmDaDrugEnt.setManagement("1");
-		wmDaDrugEnt.setPgqx(1 + "");
-		if (wmDaDrugEntService.saveDrugEnts(wmDaDrugEnt)) {
-			System.out.println("+++++++++++" + wmDaDrugEnt.getDeptId());
-			SysDept sysDept = sysDeptService.getById(wmDaDrugEnt.getDeptId());
-			if (2 == sysDept.getLevel()) {
-				WmTaskTypeEntRef wmTaskTypeEntRef = new WmTaskTypeEntRef();
-				wmTaskTypeEntRef.setDrugentId(wmDaDrugEnt.getId());
-				wmTaskTypeEntRef.setAgentId(wmDaDrugEnt.getId());
-				WmTaskType wmTaskType = new WmTaskType();
-				wmTaskType.setDurgentId(wmDaDrugEnt.getId());
-				wmTaskType.setDelFlag("0");
-				List<WmTaskType> lists = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskType));
-				if (lists.size() > 0) {
-					return R.failed("一代积分规则已分配");
-				} else {
-					if (null != wmDaDrugEnt) {
-						wmTaskTypeEntRef.setDeptId(wmDaDrugEnt.getDeptId().toString());
-					}
-					int isSave = wmTaskTypeEntRefMapper.insert(wmTaskTypeEntRef);
-
-					WmTaskType wmTaskTypeQ = new WmTaskType();
-					wmTaskTypeQ.setTaskTypeLevel("1");
-					wmTaskTypeQ.setStatus("0");
-					wmTaskTypeQ.setDelFlag("0");
-
-					List<WmTaskType> tempList = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskTypeQ));
-
-					for (WmTaskType wmTaskType1 : tempList) {
-						WmTaskType newOne = wmTaskType1;
-						newOne.setId(null);
+    private final WmDaDrugEntService wmDaDrugEntService;
+    private final WmDaAgentService wmDaAgentService;
+    private final SysUserService userService;
+    private final SysDeptService sysDeptService;
+    private final WmTaskTypeEntRefMapper wmTaskTypeEntRefMapper;
+    private final WmTaskTypeMapper wmTaskTypeMapper;
+    private final SysDeptMapper sysDeptMapper;
+    private final SysUserMapper sysUserMapper;
+    private final SysCsmUserRelationService sysCsmUserRelationService;
+    private final SysDeptCsmMapper sysDeptCsmMapper;
+    private final RedisTemplate redisTemplate;
+
+    /**
+     * 分页查询
+     *
+     * @param page        分页对象
+     * @param wmDaDrugEnt 档案-药企
+     * @return
+     */
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
+    public R getWmDaDrugEntPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
+        if (SecurityUtils.getRoles().contains(19)) {
+            // CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
+            Integer userId = SecurityUtils.getUser().getId();
+            // 递归查询下属关联的userId
+            Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
+            wmDaDrugEnt.setCsmUserIdList(allUserIds);
+        }
+
+        return R.ok(wmDaDrugEntService.selectPage(page, wmDaDrugEnt));
+    }
+
+
+    /**
+     * 通过id查询档案-药企
+     *
+     * @param id id
+     * @return R
+     */
+    @GetMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
+    public R getById(@PathVariable("id") Integer id) {
+        return R.ok(wmDaDrugEntService.getById(id));
+    }
+
+
+    /**
+     * @Modify: start
+     * @Version: v2021.4.16
+     * @Author: ryz
+     * @Date: 2021/5/26  弃用
+     */
+    /**
+     * 新增档案-药企
+     *
+     * @param wmDaDrugEnt 档案-药企
+     * @return R
+     */
+    @SysLog("新增档案-药企")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
+    public R save(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
+
+        WmDaDrugEnt query = new WmDaDrugEnt();
+        query.setEntname(wmDaDrugEnt.getEntname());
+        List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
+
+        if (list.size() > 0) {
+            return R.failed("药企公司名称已存在");
+        }
+
+        wmDaDrugEnt.setCreateTime(LocalDateTime.now());
+        return R.ok(wmDaDrugEntService.saveDrugEnt(wmDaDrugEnt));
+    }
+
+
+    /**
+     * 新增档案-药企
+     *
+     * @param wmDaDrugEnt 档案-药企
+     * @return R
+     */
+    @SysLog("新增档案-药企")
+    @PostMapping("/saves")
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saves(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
+
+        WmDaDrugEnt query = new WmDaDrugEnt();
+        query.setEntname(wmDaDrugEnt.getEntname());
+        List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
+
+        if (CollUtil.isNotEmpty(list)) {
+            return R.failed("药企公司名称已存在");
+        }
+
+        WmDaDrugEnt query1 = new WmDaDrugEnt();
+        query1.setEntcode(wmDaDrugEnt.getEntcode());
+        List<WmDaDrugEnt> list1 = wmDaDrugEntService.list(Wrappers.query(query1));
+
+        if (CollUtil.isNotEmpty(list1)) {
+            return R.failed("统一社会信用代码已经存在");
+        }
+
+        wmDaDrugEnt.setManagement("1");
+        wmDaDrugEnt.setPgqx("1");
+        if (wmDaDrugEntService.saveDrugEnts(wmDaDrugEnt)) {
+            log.info("+++++++++++{}", wmDaDrugEnt.getDeptId());
+            SysDept sysDept = sysDeptService.getById(wmDaDrugEnt.getDeptId());
+            if (2 == sysDept.getLevel()) {
+                WmTaskTypeEntRef wmTaskTypeEntRef = new WmTaskTypeEntRef();
+                wmTaskTypeEntRef.setDrugentId(wmDaDrugEnt.getId());
+                wmTaskTypeEntRef.setAgentId(wmDaDrugEnt.getId());
+                WmTaskType wmTaskType = new WmTaskType();
+                wmTaskType.setDurgentId(wmDaDrugEnt.getId());
+                wmTaskType.setDelFlag("0");
+                List<WmTaskType> lists = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskType));
+                if (CollUtil.isNotEmpty(lists)) {
+                    return R.failed("一代积分规则已分配");
+                } else {
+                    wmTaskTypeEntRef.setDeptId(wmDaDrugEnt.getDeptId().toString());
+                    wmTaskTypeEntRefMapper.insert(wmTaskTypeEntRef);
+
+                    WmTaskType wmTaskTypeQ = new WmTaskType();
+                    wmTaskTypeQ.setTaskTypeLevel("1");
+                    wmTaskTypeQ.setStatus("0");
+                    wmTaskTypeQ.setDelFlag("0");
+
+                    List<WmTaskType> tempList = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskTypeQ));
+
+                    for (WmTaskType wmTaskType1 : tempList) {
+                        wmTaskType1.setId(null);
 //						newOne.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-						newOne.setDurgentId(wmTaskTypeEntRef.getAgentId());
-						newOne.setTaskTypeLevel("2");
-						newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-						newOne.setDeptId(wmDaDrugEnt.getDeptId() + "");
-						newOne.setCreateTime(LocalDateTime.now());
-						newOne.setStatus("0");
-						newOne.setBaseId(wmTaskType1.getId());
-						newOne.setRuleId(wmTaskTypeEntRef.getAgentId().toString());
-						newOne.setParentId(wmTaskType1.getParentId());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-			}
-
-			// CSM创建的企业,负责人默认是该CSM
-			Integer userId = SecurityUtils.getUser().getId();
-			SysUser user = sysUserMapper.selectById(userId);
-			SysDeptCsm insert = new SysDeptCsm();
-			insert.setDeptId(Integer.valueOf(wmDaDrugEnt.getDeptId()));
-			insert.setUserId(userId);
-			insert.setCsmName(user.getRealname());
-			insert.setQrCodeId(" ");
-			insert.setCorpId(" ");
-			sysDeptCsmMapper.insert(insert);
-		}
-		wmDaDrugEnt.setCreateTime(LocalDateTime.now());
-
-		return R.ok();
-	}
-
-	/**
-	 * 修改档案-药企
-	 *
-	 * @param wmDaDrugEnt 档案-药企
-	 * @return R
-	 */
-	@SysLog("修改档案-药企")
-	@PutMapping
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_edit')")
-	@Transactional(rollbackFor = Exception.class)
-	public R updateById(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
-		if (wmDaDrugEnt.getDeptId() == null || wmDaDrugEnt.getId() == null) {
-			return R.failed("id和deptId必填");
-		}
-
-		SysDept sysDept = new SysDept();
-		sysDept.setDelFlag(wmDaDrugEnt.getEnableFlag());
-		sysDept.setName(wmDaDrugEnt.getEntname());
-		sysDept.setDeptId(wmDaDrugEnt.getDeptId());
-
-
-		/**
-		* @Modify: start
-		* @Author: ryz
-		* @Date: 2021/4/19
-		*/
+                        wmTaskType1.setDurgentId(wmTaskTypeEntRef.getAgentId());
+                        wmTaskType1.setTaskTypeLevel("2");
+                        wmTaskType1.setTaskEntId(wmTaskTypeEntRef.getAgentId());
+                        wmTaskType1.setDeptId(wmDaDrugEnt.getDeptId());
+                        wmTaskType1.setCreateTime(LocalDateTime.now());
+                        wmTaskType1.setStatus("0");
+                        wmTaskType1.setBaseId(wmTaskType1.getId());
+                        wmTaskType1.setRuleId(wmTaskTypeEntRef.getAgentId().toString());
+                        wmTaskType1.setParentId(wmTaskType1.getParentId());
+                        wmTaskTypeMapper.insert(wmTaskType1);
+                    }
+                }
+            }
+
+            // CSM创建的企业,负责人默认是该CSM
+            Integer userId = SecurityUtils.getUser().getId();
+            SysUser user = sysUserMapper.selectById(userId);
+            SysDeptCsm insert = new SysDeptCsm();
+            insert.setDeptId(wmDaDrugEnt.getDeptId());
+            insert.setUserId(userId);
+            insert.setCsmName(user.getRealname());
+            sysDeptCsmMapper.insert(insert);
+        }
+        wmDaDrugEnt.setCreateTime(LocalDateTime.now());
+
+        return R.ok();
+    }
+
+    /**
+     * 修改档案-药企
+     *
+     * @param wmDaDrugEnt 档案-药企
+     * @return R
+     */
+    @SysLog("修改档案-药企")
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_edit')")
+    @Transactional(rollbackFor = Exception.class)
+    public R updateById(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
+        if (wmDaDrugEnt.getDeptId() == null || wmDaDrugEnt.getId() == null) {
+            return R.failed("id和deptId必填");
+        }
+
+        SysDept sysDept = new SysDept();
+        sysDept.setDelFlag(wmDaDrugEnt.getEnableFlag());
+        sysDept.setName(wmDaDrugEnt.getEntname());
+        sysDept.setDeptId(wmDaDrugEnt.getDeptId());
+
+
+        /**
+         * @Modify: start
+         * @Author: ryz
+         * @Date: 2021/4/19
+         */
 //		if(!Arrays.equals(sysDept.getSubjectType(),wmDaDrugEnt.getSubjectType())){
 //			sysDeptSubService.update(Wrappers.<SysDeptSub>lambdaUpdate()
 //					.eq(SysDeptSub::getDeptId,sysDept.getDeptId())
@@ -261,189 +259,189 @@ public class WmDaDrugEntController {
 //				}
 //			}
 //		}
-		sysDept.setTaxCode(wmDaDrugEnt.getEntcode());
-		/**
-		* @Modify: end
-		*/
-
-		sysDept.setSubjectType(wmDaDrugEnt.getSubjectType());
-		sysDept.setDeptPermissions(wmDaDrugEnt.getDeptPermissions());
-		sysDept.setFinancialReviewType(wmDaDrugEnt.getFinancialReviewType());
-		sysDeptMapper.updateByPrimaryKeySelective(sysDept);
-		SysUser sysUserCondition = new SysUser();
-		sysUserCondition.setDeptId(wmDaDrugEnt.getDeptId());
-		List<SysUser> sysUserList = sysUserMapper.selectUserById(sysUserCondition);
+        sysDept.setTaxCode(wmDaDrugEnt.getEntcode());
+        /**
+         * @Modify: end
+         */
+
+        sysDept.setSubjectType(wmDaDrugEnt.getSubjectType());
+        sysDept.setDeptPermissions(wmDaDrugEnt.getDeptPermissions());
+        sysDept.setFinancialReviewType(wmDaDrugEnt.getFinancialReviewType());
+        sysDeptMapper.updateByPrimaryKeySelective(sysDept);
+        SysUser sysUserCondition = new SysUser();
+        sysUserCondition.setDeptId(wmDaDrugEnt.getDeptId());
+        List<SysUser> sysUserList = sysUserMapper.selectUserById(sysUserCondition);
 //		List<Integer> id1 = sysUserList.stream().map(p -> p.getUserId()).collect(Collectors.toList());
-		/**
-		 * 修改机构的人员状态
-		 */
-		for (SysUser item : sysUserList) {
-			item.setDelFlag(wmDaDrugEnt.getEnableFlag());
-			sysUserMapper.updateByPrimaryKeySelective(item);
-		}
-
-		if (EnableEnum.DISABLE.val().equals(wmDaDrugEnt.getEnableFlag())) {
-			// 移除user的缓存
-			Set<String> userNameKeys = sysUserList.stream()
-					.map(sysUser -> String.format("%s%s", CacheConstants.USER_DETAILS, sysUser.getUsername()))
-					.collect(Collectors.toSet());
-			redisTemplate.delete(userNameKeys);
-		}
-
-		wmDaDrugEnt.setUpdateTime(LocalDateTime.now());
-		wmDaDrugEnt.setUpdateUser(SecurityUtils.getUser().getId());
-
-		return R.ok(wmDaDrugEntService.updateById(wmDaDrugEnt));
-	}
-
-	/**
-	 * 通过id删除档案-药企
-	 *
-	 * @param id id
-	 * @return R
-	 */
-	@SysLog("通过id删除档案-药企")
-	@DeleteMapping("/{id}")
-	@PreAuthorize("@pms.hasPermission('admin_wmdadrugent_del')")
-	public R removeById(@PathVariable Integer id) {
-		return R.ok(wmDaDrugEntService.removeById(id));
-	}
-
-
-	/**
-	 * 获取药企列表
-	 *
-	 * @return 角色列表
-	 */
-	@GetMapping("/list")
-	public R listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
-		wmDaDrugEnt.setDelFlag("0");
-		wmDaDrugEnt.setEnableFlag("0");
-		if (null != wmDaDrugEnt.getEntname()) {
-			String entname = wmDaDrugEnt.getEntname();
-			wmDaDrugEnt.setEntname(null);
-			return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt).lambda().like(WmDaDrugEnt::getEntname, entname)));
-		} else {
-			return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
-		}
-	}
-
-	/**
-	 * 获取药企列表
-	 *
-	 * @return 角色列表
-	 */
-	@GetMapping("/listScope")
-	public R listScope(WmDaDrugEnt wmDaDrugEnt) {
-		wmDaDrugEnt.setDelFlag("0");
-		wmDaDrugEnt.setEnableFlag("0");
-
-		if (null != wmDaDrugEnt.getEntname()) {
-			String entname = wmDaDrugEnt.getEntname();
-			wmDaDrugEnt.setEntname(null);
-			return R.ok(wmDaDrugEntService.selectByScope(Wrappers.query(wmDaDrugEnt).lambda().like(WmDaDrugEnt::getEntname, entname)));
-		} else {
-			return R.ok(wmDaDrugEntService.selectByScope(Wrappers.query(wmDaDrugEnt)));
-		}
-	}
-
-	/**
-	 * 获取药企列表
-	 *
-	 * @return 角色列表
-	 */
-	@GetMapping("/listBySel")
-	public R listBySel(WmDaDrugEnt wmDaDrugEnt) {
-		wmDaDrugEnt.setDelFlag("0");
-		wmDaDrugEnt.setEnableFlag("0");
-		if (!SecurityUtils.getRoles().contains(1) && !SecurityUtils.getRoles().contains(2)) {
-			wmDaDrugEnt.setId(SecurityUtils.getUser().getDrugEntId());
-			return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
-		} else {
-			return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
-		}
-	}
-
-
-	private boolean isZbOrDbUsers(Integer[] roles) {
-		if (null == roles) {
-			return false;
-		}
-
-		if (Arrays.asList(roles).contains(1) || Arrays.asList(roles).contains(2) || Arrays.asList(roles).contains(3) || Arrays.asList(roles).contains(4)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * 通过ID查询
-	 *
-	 * @param username
-	 * @return SysDept
-	 */
-	@GetMapping("/getDrugListByUsername")
-	public R getDrugListByUsername(String username) {
-
-		List<SysUser> userList = userService.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username).eq(SysUser::getDelFlag, "0"));
-		List<Integer> list = new ArrayList<>();
-		if (userList.size() > 0) {
-			for (SysUser s : userList
-			) {
-				if (null != s.getDrugEntId() && !"null".equals(s.getDrugEntId()) && !"".equals(s.getDrugEntId())) {
-					UserInfo userInfo = userService.findUserInfo(s);
-					if (isZbOrDbUsers(userInfo.getRoles())) {
-						list.add(s.getDrugEntId());
-					}
-				}
-			}
-		}
-		if (list.size() > 0) {
-			return R.ok(wmDaDrugEntService.listByIds(list));
-		} else {
-			return R.ok();
-		}
-	}
-
-
-	/**
-	 * 通过ID查询
-	 *
-	 * @return SysDept
-	 */
-	@GetMapping("/getDrugListByAgentServiceEnt")
-	public R getDrugListByAgentServiceEnt() {
-
-		List<String> stringList = new ArrayList<>();
-
-		SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-		if (null != sysDept) {
-			String levelId = "";
-			if (sysDept.getLevel() == 3) {
-				levelId = sysDept.getLevel2Id() + "";
-			} else {
-				levelId = sysDept.getLevel3Id() + "";
-			}
-			WmDaAgent wmDaAgent = wmDaAgentService.getById(levelId);
-			if (null != wmDaAgent && null != wmDaAgent.getExtDrugEnt() && !"".equals(wmDaAgent.getExtDrugEnt())) {
-				String extDrugEnt = wmDaAgent.getExtDrugEnt();
-				String ext[] = extDrugEnt.split(",");
-				for (String args : ext) {
-					if (!(sysDept.getLevel1Id() + "").equals(args)) {
-						stringList.add(args);
-					}
-				}
-			}
-		}
-		stringList.add(SecurityUtils.getUser().getDrugEntId().toString());
-
-		if (stringList.size() > 0) {
-			return R.ok(wmDaDrugEntService.listByIds(stringList));
-		}
-
-		return R.ok();
-
-	}
+        /**
+         * 修改机构的人员状态
+         */
+        for (SysUser item : sysUserList) {
+            item.setDelFlag(wmDaDrugEnt.getEnableFlag());
+            sysUserMapper.updateByPrimaryKeySelective(item);
+        }
+
+        if (EnableEnum.DISABLE.val().equals(wmDaDrugEnt.getEnableFlag())) {
+            // 移除user的缓存
+            Set<String> userNameKeys = sysUserList.stream()
+                    .map(sysUser -> String.format("%s%s", CacheConstants.USER_DETAILS, sysUser.getUsername()))
+                    .collect(Collectors.toSet());
+            redisTemplate.delete(userNameKeys);
+        }
+
+        wmDaDrugEnt.setUpdateTime(LocalDateTime.now());
+        wmDaDrugEnt.setUpdateUser(SecurityUtils.getUser().getId());
+
+        return R.ok(wmDaDrugEntService.updateById(wmDaDrugEnt));
+    }
+
+    /**
+     * 通过id删除档案-药企
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("通过id删除档案-药企")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_del')")
+    public R removeById(@PathVariable Integer id) {
+        return R.ok(wmDaDrugEntService.removeById(id));
+    }
+
+
+    /**
+     * 获取药企列表
+     *
+     * @return 角色列表
+     */
+    @GetMapping("/list")
+    public R listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
+        wmDaDrugEnt.setDelFlag("0");
+        wmDaDrugEnt.setEnableFlag("0");
+        if (null != wmDaDrugEnt.getEntname()) {
+            String entname = wmDaDrugEnt.getEntname();
+            wmDaDrugEnt.setEntname(null);
+            return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt).lambda().like(WmDaDrugEnt::getEntname, entname)));
+        } else {
+            return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
+        }
+    }
+
+    /**
+     * 获取药企列表
+     *
+     * @return 角色列表
+     */
+    @GetMapping("/listScope")
+    public R listScope(WmDaDrugEnt wmDaDrugEnt) {
+        wmDaDrugEnt.setDelFlag("0");
+        wmDaDrugEnt.setEnableFlag("0");
+
+        if (null != wmDaDrugEnt.getEntname()) {
+            String entname = wmDaDrugEnt.getEntname();
+            wmDaDrugEnt.setEntname(null);
+            return R.ok(wmDaDrugEntService.selectByScope(Wrappers.query(wmDaDrugEnt).lambda().like(WmDaDrugEnt::getEntname, entname)));
+        } else {
+            return R.ok(wmDaDrugEntService.selectByScope(Wrappers.query(wmDaDrugEnt)));
+        }
+    }
+
+    /**
+     * 获取药企列表
+     *
+     * @return 角色列表
+     */
+    @GetMapping("/listBySel")
+    public R listBySel(WmDaDrugEnt wmDaDrugEnt) {
+        wmDaDrugEnt.setDelFlag("0");
+        wmDaDrugEnt.setEnableFlag("0");
+        if (!SecurityUtils.getRoles().contains(1) && !SecurityUtils.getRoles().contains(2)) {
+            wmDaDrugEnt.setId(SecurityUtils.getUser().getDrugEntId());
+            return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
+        } else {
+            return R.ok(wmDaDrugEntService.list(Wrappers.query(wmDaDrugEnt)));
+        }
+    }
+
+
+    private boolean isZbOrDbUsers(Integer[] roles) {
+        if (null == roles) {
+            return false;
+        }
+
+        if (Arrays.asList(roles).contains(1) || Arrays.asList(roles).contains(2) || Arrays.asList(roles).contains(3) || Arrays.asList(roles).contains(4)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 通过ID查询
+     *
+     * @param username
+     * @return SysDept
+     */
+    @GetMapping("/getDrugListByUsername")
+    public R getDrugListByUsername(String username) {
+
+        List<SysUser> userList = userService.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username).eq(SysUser::getDelFlag, "0"));
+        List<Integer> list = new ArrayList<>();
+        if (userList.size() > 0) {
+            for (SysUser s : userList
+            ) {
+                if (null != s.getDrugEntId() && !"null".equals(s.getDrugEntId()) && !"".equals(s.getDrugEntId())) {
+                    UserInfo userInfo = userService.findUserInfo(s);
+                    if (isZbOrDbUsers(userInfo.getRoles())) {
+                        list.add(s.getDrugEntId());
+                    }
+                }
+            }
+        }
+        if (list.size() > 0) {
+            return R.ok(wmDaDrugEntService.listByIds(list));
+        } else {
+            return R.ok();
+        }
+    }
+
+
+    /**
+     * 通过ID查询
+     *
+     * @return SysDept
+     */
+    @GetMapping("/getDrugListByAgentServiceEnt")
+    public R getDrugListByAgentServiceEnt() {
+
+        List<String> stringList = new ArrayList<>();
+
+        SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+        if (null != sysDept) {
+            String levelId = "";
+            if (sysDept.getLevel() == 3) {
+                levelId = sysDept.getLevel2Id() + "";
+            } else {
+                levelId = sysDept.getLevel3Id() + "";
+            }
+            WmDaAgent wmDaAgent = wmDaAgentService.getById(levelId);
+            if (null != wmDaAgent && null != wmDaAgent.getExtDrugEnt() && !"".equals(wmDaAgent.getExtDrugEnt())) {
+                String extDrugEnt = wmDaAgent.getExtDrugEnt();
+                String ext[] = extDrugEnt.split(",");
+                for (String args : ext) {
+                    if (!(sysDept.getLevel1Id() + "").equals(args)) {
+                        stringList.add(args);
+                    }
+                }
+            }
+        }
+        stringList.add(SecurityUtils.getUser().getDrugEntId().toString());
+
+        if (stringList.size() > 0) {
+            return R.ok(wmDaDrugEntService.listByIds(stringList));
+        }
+
+        return R.ok();
+
+    }
 
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskTypeConfigController.java

@@ -44,96 +44,96 @@ import java.util.stream.Collectors;
 @RequestMapping("/dept-task-type-config")
 public class WmDeptTaskTypeConfigController {
 
-	private WmDeptTaskTypeConfigService wmDeptTaskTypeConfigService;
+    private WmDeptTaskTypeConfigService wmDeptTaskTypeConfigService;
 
-	private SysDeptRelationService sysDeptRelationService;
+    private SysDeptRelationService sysDeptRelationService;
 
-	/**
-	 * 保存任务类型配置
-	 *
-	 * @param wmDeptTaskTypeConfigDTO
-	 * @return
-	 */
-	@SysLog("保存任务类型配置")
-	@PostMapping("/save")
-	public R<?> saveDeptTaskTypeConfig(@Validated @RequestBody WmDeptTaskTypeConfigDTO wmDeptTaskTypeConfigDTO) {
-		wmDeptTaskTypeConfigService.saveDeptTaskTypeConfig(wmDeptTaskTypeConfigDTO);
-		return R.ok();
-	}
+    /**
+     * 保存任务类型配置
+     *
+     * @param wmDeptTaskTypeConfigDTO 参数
+     * @return 任务类型配置
+     */
+    @SysLog("保存任务类型配置")
+    @PostMapping("/save")
+    public R<?> saveDeptTaskTypeConfig(@Validated @RequestBody WmDeptTaskTypeConfigDTO wmDeptTaskTypeConfigDTO) {
+        wmDeptTaskTypeConfigService.saveDeptTaskTypeConfig(wmDeptTaskTypeConfigDTO);
+        return R.ok();
+    }
 
-	/**
-	 * 查询任务类型配置
-	 *
-	 * @param deptId
-	 * @return
-	 */
-	@GetMapping("/{deptId}")
-	public R<WmDeptTaskTypeConfigDTO> getDeptTaskTypeConfig(@PathVariable("deptId") Integer deptId) {
-		return R.ok(wmDeptTaskTypeConfigService.getDeptTaskTypeConfig(deptId));
-	}
+    /**
+     * 查询任务类型配置
+     *
+     * @param deptId id
+     * @return 任务类型配置
+     */
+    @GetMapping("/{deptId}")
+    public R<WmDeptTaskTypeConfigDTO> getDeptTaskTypeConfig(@PathVariable("deptId") Integer deptId) {
+        return R.ok(wmDeptTaskTypeConfigService.getDeptTaskTypeConfig(deptId));
+    }
 
-	/**
-	 * 是否配置了企业的任务类型配置
-	 *
-	 * @return
-	 */
-	@GetMapping("/is-config")
-	public R<?> isConfig() {
-		Map<String, Object> resultMap = new HashMap<>();
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-		AtomicBoolean configed = new AtomicBoolean(false);
-		// 本级dept对应的任务类型
-		WmDeptTaskTypeConfig deptTaskTypeConfig = wmDeptTaskTypeConfigService.getOne(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery()
-				.eq(WmDeptTaskTypeConfig::getDeptId, deptId));
-		if (deptTaskTypeConfig != null) {
-			List<WmDeptTaskTypeConfigJsonDTO> configJsonDTOList =
-					JSON.parseArray(deptTaskTypeConfig.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class);
-			configJsonDTOList.forEach(configJsonDTO -> {
-				if (configJsonDTO.getQualifiedTask()) {
-					configed.set(true);
-				}
-			});
-		}
-		// 查询上级的deptId
-		List<SysDeptRelation> ancestorDeptRelations = sysDeptRelationService.list(Wrappers.<SysDeptRelation>lambdaQuery()
-				.eq(SysDeptRelation::getDescendant, deptId)
-				.ne(SysDeptRelation::getAncestor, deptId)
-				.ne(SysDeptRelation::getAncestor, 1));
-		// 上级dept对应任务类型配置
-		if (CollUtil.isNotEmpty(ancestorDeptRelations)) {
-			List<Integer> ancestorIds = ancestorDeptRelations.stream().mapToInt(SysDeptRelation::getAncestor).boxed().collect(Collectors.toList());
-			List<WmDeptTaskTypeConfig> ancestorDeptTaskTypeConfigs = wmDeptTaskTypeConfigService.list(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery().eq(WmDeptTaskTypeConfig::getDeptId, ancestorIds));
-			if (CollUtil.isNotEmpty(ancestorDeptTaskTypeConfigs)) {
-				List<WmDeptTaskTypeConfigJsonDTO> ancestorConfigJsonDTOList =
-						ancestorDeptTaskTypeConfigs.stream()
-								.flatMap(config -> JSON.parseArray(config.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class).stream()).collect(Collectors.toList());
+    /**
+     * 是否配置了企业的任务类型配置
+     *
+     * @return 类型配置
+     */
+    @GetMapping("/is-config")
+    public R<?> isConfig() {
+        Map<String, Object> resultMap = new HashMap<>(1);
+        Integer deptId = SecurityUtils.getUser().getDeptId();
+        AtomicBoolean configed = new AtomicBoolean(false);
+        // 本级dept对应的任务类型
+        WmDeptTaskTypeConfig deptTaskTypeConfig = wmDeptTaskTypeConfigService.getOne(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery()
+                .eq(WmDeptTaskTypeConfig::getDeptId, deptId));
+        if (deptTaskTypeConfig != null) {
+            List<WmDeptTaskTypeConfigJsonDTO> configJsonDTOList =
+                    JSON.parseArray(deptTaskTypeConfig.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class);
+            configJsonDTOList.forEach(configJsonDTO -> {
+                if (configJsonDTO.getQualifiedTask()) {
+                    configed.set(true);
+                }
+            });
+        }
+        // 查询上级的deptId
+        List<SysDeptRelation> ancestorDeptRelations = sysDeptRelationService.list(Wrappers.<SysDeptRelation>lambdaQuery()
+                .eq(SysDeptRelation::getDescendant, deptId)
+                .ne(SysDeptRelation::getAncestor, deptId)
+                .ne(SysDeptRelation::getAncestor, 1));
+        // 上级dept对应任务类型配置
+        if (CollUtil.isNotEmpty(ancestorDeptRelations)) {
+            List<Integer> ancestorIds = ancestorDeptRelations.stream().mapToInt(SysDeptRelation::getAncestor).boxed().collect(Collectors.toList());
+            List<WmDeptTaskTypeConfig> ancestorDeptTaskTypeConfigs = wmDeptTaskTypeConfigService.list(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery().in(WmDeptTaskTypeConfig::getDeptId, ancestorIds));
+            if (CollUtil.isNotEmpty(ancestorDeptTaskTypeConfigs)) {
+                List<WmDeptTaskTypeConfigJsonDTO> ancestorConfigJsonDTOList =
+                        ancestorDeptTaskTypeConfigs.stream()
+                                .flatMap(config -> JSON.parseArray(config.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class).stream()).collect(Collectors.toList());
 
-				ancestorConfigJsonDTOList.forEach(configJsonDTO -> {
-					if (configJsonDTO.getQualifiedTask() && configJsonDTO.getAssociateLower()) {
-						configed.set(true);
-					}
-				});
-			}
-		}
-		resultMap.put("config", configed.get());
-		return R.ok(resultMap);
-	}
+                ancestorConfigJsonDTOList.forEach(configJsonDTO -> {
+                    if (configJsonDTO.getQualifiedTask() && configJsonDTO.getAssociateLower()) {
+                        configed.set(true);
+                    }
+                });
+            }
+        }
+        resultMap.put("config", configed.get());
+        return R.ok(resultMap);
+    }
 
-	/**
-	 * 根据企业的任务类型配置查询任务列表
-	 *
-	 * @param page         分页参数
-	 * @param taskTypeName 任务类型名称
-	 * @param taskStatus   任务状态
-	 * @return
-	 */
-	@GetMapping("/list-task")
-	public R<IPage<WmTask>> listTaskByDeptTaskType(Page<WmTask> page, String taskTypeName, String[] taskStatus) {
-		if (ArrayUtil.isEmpty(taskStatus)) {
-			return R.failed("taskStatus不能为空");
-		}
+    /**
+     * 根据企业的任务类型配置查询任务列表
+     *
+     * @param page         分页参数
+     * @param taskTypeName 任务类型名称
+     * @param taskStatus   任务状态
+     * @return 任务列表
+     */
+    @GetMapping("/list-task")
+    public R<IPage<WmTask>> listTaskByDeptTaskType(Page<WmTask> page, String taskTypeName, String[] taskStatus) {
+        if (ArrayUtil.isEmpty(taskStatus)) {
+            return R.failed("taskStatus不能为空");
+        }
 
-		return R.ok(wmDeptTaskTypeConfigService.listTaskByConfig(page, taskTypeName, taskStatus));
-	}
+        return R.ok(wmDeptTaskTypeConfigService.listTaskByConfig(page, taskTypeName, taskStatus));
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -38,8 +38,8 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordPackageType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeMapper;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -1,4 +1,3 @@
-
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -59,11 +58,11 @@ public class WmTaskTypeController {
 	 * @return
 	 */
 	@GetMapping("/getTaskTypeDeptList")
-	public R getTaskTypeDeptList() {
+	public R<?> getTaskTypeDeptList() {
 
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		WmTaskType query = new WmTaskType();
-		query.setDeptId(deptId + "");
+		query.setDeptId(deptId);
 		List<WmTaskTypeDeptOutput> deptOutputList = wmTaskTypeService.getTaskTypeDeptList(query);
 
 		if(CollectionUtils.isEmpty(deptOutputList)){
@@ -74,13 +73,13 @@ public class WmTaskTypeController {
 		List<Map<String,String>>  resultList2 = new ArrayList<>();
 
 		for (WmTaskTypeDeptOutput output : deptOutputList) {
-			if(StringUtils.isNotEmpty(output.getDurgentId())){
+			if(output.getDurgentId() != null){
 				WmDaDrugEnt drugEnt = wmDaDrugEntService.getById(output.getDurgentId());
 				if(null !=drugEnt){
 					Map<String,String> map = new HashMap<>();
 					map.put("value",output.getRuleId());
 					map.put("label",drugEnt.getEntname());
-					if(drugEnt.getDeptId().equals(deptId + "")){
+					if(drugEnt.getDeptId().equals(deptId)){
 						resultList2.add(map);
 					}else {
 						resultList.add(map);
@@ -95,7 +94,7 @@ public class WmTaskTypeController {
 					Map<String,String> map = new HashMap<>();
 					map.put("value",output.getRuleId());
 					map.put("label",daAgent.getGsmc());
-					if(daAgent.getDeptId().equals(deptId + "")){
+					if(daAgent.getDeptId().equals(deptId)){
 						resultList2.add(map);
 					}else {
 						resultList.add(map);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeEntRefController.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,19 +8,32 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
-import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeEntRefService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -33,256 +47,171 @@ import java.util.List;
 @RequestMapping("/wmtasktypeentref")
 public class WmTaskTypeEntRefController {
 
-	private final WmTaskTypeEntRefService wmTaskTypeEntRefService;
-	private final WmTaskTypeService wmTaskTypeService;
-	private final WmDaAgentService wmDaAgentService;
-	private final SysDeptService sysDeptService;
-	private final WmDaDrugEntService wmDaDrugEntService;
-	private final SysDeptMapper sysDeptMapper;
-
-	/**
-	 * 分页查询
-	 *
-	 * @param page             分页对象
-	 * @param wmTaskTypeEntRef 药企给代理商设定积分规则
-	 * @return
-	 */
-	@GetMapping("/page")
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_view')" )
-	public R getWmTaskTypeEntRefPage(Page page, WmTaskTypeEntRef wmTaskTypeEntRef) {
-		OrderItem orderItem = new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
-//		SysDept sysDept1 = new SysDept();
-//		sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
-//		SysDept deptId = sysDeptMapper.selectDeptId(sysDept1);
-		SysDept deptId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-		WmDaDrugEnt drId = wmDaDrugEntService.selectByDeptId(deptId.getDeptId());
-		wmTaskTypeEntRef.setDrugentId((drId.getId()));
-		return R.ok(wmTaskTypeEntRefService.page(page, Wrappers.query(wmTaskTypeEntRef)));
-	}
-
-	/**
-	 * 分页查询
-	 *
-	 * @param page             分页对象
-	 * @param wmTaskTypeEntRef 药企给代理商设定积分规则
-	 * @return
-	 */
-	@GetMapping("/pages")
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_view')" )
-	public R getWmTaskTypeEntRefPages(Page page, WmTaskTypeEntRef wmTaskTypeEntRef) {
-		OrderItem orderItem = new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
-//		SysDept sysDept1 = new SysDept();
-//		sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
-//		SysDept deptId = sysDeptMapper.selectDeptId(sysDept1);
-
-		SysDept deptId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-		WmDaAgent anId = wmDaAgentService.selectByDeptId(deptId.getDeptId());
-		if (anId == null) {
-			return R.ok(new ArrayList<>());
-		}
-		wmTaskTypeEntRef.setAgentId(anId.getId());
-		wmTaskTypeEntRef.setDrugentId(null);
-		return R.ok(wmTaskTypeEntRefService.page(page, Wrappers.query(wmTaskTypeEntRef)));
-	}
-
-
-	/**
-	 * 通过id查询药企给代理商设定积分规则
-	 *
-	 * @param id id
-	 * @return R
-	 */
-	@GetMapping("/{id}")
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_view')" )
-	public R getById(@PathVariable("id") Integer id) {
-		return R.ok(wmTaskTypeEntRefService.getById(id));
-	}
-
-	/**
-	 * 新增药企给代理商设定积分规则
-	 *
-	 * @param wmTaskTypeEntRef 药企给代理商设定积分规则
-	 * @return R
-	 */
-	@SysLog("新增药企给代理商设定积分规则")
-	@PostMapping
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_add')" )
-	public R save(@RequestBody WmTaskTypeEntRef wmTaskTypeEntRef) {
-		wmTaskTypeEntRef.setDrugentId(SecurityUtils.getUser().getDrugEntId());
-
-		WmTaskType wmTaskType = new WmTaskType();
-		wmTaskType.setDurgentId(SecurityUtils.getUser().getDrugEntId());
-		wmTaskType.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-		wmTaskType.setDelFlag("0");
-		List<WmTaskType> list = wmTaskTypeService.list(Wrappers.query(wmTaskType));
-		WmDaAgent wmDaAgent = wmDaAgentService.getById(wmTaskTypeEntRef.getAgentId());
-		if (list.size() > 0) {
-			return R.failed("一代积分规则已分配");
-		} else {
-			if (null != wmDaAgent) {
-				wmTaskTypeEntRef.setDeptId(wmDaAgent.getDeptId().toString());
-			}
-			boolean isSave = wmTaskTypeEntRefService.save(wmTaskTypeEntRef);
-
-			WmTaskType wmTaskTypeQ = new WmTaskType();
-			wmTaskTypeQ.setTaskTypeLevel("1");
-			wmTaskTypeQ.setDelFlag("0");
-			wmTaskTypeQ.setStatus("0");
-			List<WmTaskType> tempList = wmTaskTypeService.list(Wrappers.query(wmTaskTypeQ));
-			List<WmTaskType> newList = new ArrayList<>();
-
-			for (WmTaskType wmTaskType1 : tempList) {
-				WmTaskType newOne = wmTaskType1;
-				newOne.setId(null);
-				newOne.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-				newOne.setDurgentId(SecurityUtils.getUser().getDrugEntId());
-				newOne.setTaskTypeLevel("2");
-				newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-				newOne.setDeptId(wmDaAgent.getDeptId() + "");
-				newOne.setCreateTime(LocalDateTime.now());
-				newOne.setStatus("0");
-				newOne.setBaseId(wmTaskType1.getId());
-				newList.add(newOne);
-			}
-			wmTaskTypeService.saveBatch(newList);
-
-			return R.ok(isSave);
-
-		}
-	}
-
-
-	/**
-	 * 新增药企给代理商设定积分规则
-	 *
-	 * @param wmTaskTypeEntRef 药企给代理商设定积分规则
-	 * @return R
-	 */
-	@SysLog("新增药企给代理商设定积分规则")
-	@PostMapping("saves")
-	@Transactional(rollbackFor = Exception.class)
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_add')" )
-	public R saves(@RequestBody WmTaskTypeEntRef wmTaskTypeEntRef) {
-
-//		SysDept sysDept1 = new SysDept();
-//		sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
-//		SysDept deptId = sysDeptMapper.selectDeptId(sysDept1);
-
-		SysDept deptId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-		WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(deptId.getDeptId());
-
-		wmTaskTypeEntRef.setDrugentId(wmDaDrugEnt.getId());
-
-		WmTaskType wmTaskType = new WmTaskType();
-		wmTaskType.setDurgentId(wmTaskTypeEntRef.getDrugentId());
-		wmTaskType.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-		wmTaskType.setDelFlag("0");
-		List<WmTaskType> list = wmTaskTypeService.list(Wrappers.query(wmTaskType));
-		WmDaAgent wmDaAgent = wmDaAgentService.getById(wmTaskTypeEntRef.getAgentId());
-		WmDaDrugEnt wmDaDrugEnt1 = wmDaDrugEntService.getById(wmTaskTypeEntRef.getDrugentId());
-//		SysDept sysDept2 = new SysDept();
-//		sysDept2.setDeptId(Integer.valueOf(wmDaDrugEnt1.getDeptId()));
-//		SysDept DrugEntDeptId = sysDeptMapper.selectDeptId(sysDept2);
-
-		SysDept DrugEntDeptId = sysDeptService.getById(Integer.valueOf(wmDaDrugEnt1.getDeptId()));
-
-		if (list.size() > 0) {
-//			SysDept sysDept3 = new SysDept();
-//			sysDept3.setDeptId(Integer.valueOf(wmDaAgent.getDeptId()));
-//			SysDept AgentDeptId = sysDeptMapper.selectDeptId(sysDept3);
-
-			SysDept AgentDeptId = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
-//			SysDept AgentDeptId = sysDeptService.selectByName(wmDaAgent.getGsmc());
-			if (AgentDeptId.getLevel() == 3) {
-				for (WmTaskType wmTaskType1 : list) {
-					if (wmTaskType1.getLevel1Id().equals(wmTaskTypeEntRef.getAgentId()) &&
-							wmTaskType1.getDurgentId().equals(wmTaskTypeEntRef.getDrugentId())) {
-					}
-				}
-				return R.failed("药企已分配一代积分规则");
-			}
-		}
-		else if (null != wmDaAgent) {
-			wmTaskTypeEntRef.setDeptId(wmDaAgent.getDeptId().toString());
-		}else if (DrugEntDeptId.getLevel() == 2) {
-			return R.failed("药企只能分配积分规则");
-		}
-
-		boolean isSave = wmTaskTypeEntRefService.save(wmTaskTypeEntRef);
-		WmTaskType wmTaskTypeQ = new WmTaskType();
-		wmTaskTypeQ.setTaskTypeLevel("1");
-		wmTaskTypeQ.setDelFlag("0");
-		wmTaskTypeQ.setStatus("0");
-		List<WmTaskType> tempList = wmTaskTypeService.list(Wrappers.query(wmTaskTypeQ));
-		List<WmTaskType> newList = new ArrayList<>();
-
-		for (WmTaskType wmTaskType1 : tempList) {
-			WmTaskType newOne = wmTaskType1;
-			newOne.setId(null);
-			newOne.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-			newOne.setDurgentId(wmTaskTypeEntRef.getDrugentId());
-			newOne.setTaskTypeLevel("2");
-			newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-			newOne.setDeptId(wmDaAgent.getDeptId() + "");
-			newOne.setCreateTime(LocalDateTime.now());
-			newOne.setStatus("0");
-			newOne.setBaseId(wmTaskType1.getId());
-			newOne.setRuleId(""+wmTaskType1.getDurgentId() + wmTaskType1.getLevel1Id());
-			newOne.setParentId(wmTaskType1.getParentId());
-			newList.add(newOne);
-		}
-
-
-		wmTaskTypeService.saveBatch(newList);
-
-		return R.ok(isSave);
-	}
-
-
-	/**
-	 * 修改药企给代理商设定积分规则
-	 *
-	 * @param wmTaskTypeEntRef 药企给代理商设定积分规则
-	 * @return R
-	 */
-	@SysLog("修改药企给代理商设定积分规则")
-	@PutMapping
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_edit')" )
-	public R updateById(@RequestBody WmTaskTypeEntRef wmTaskTypeEntRef) {
-		return R.ok(wmTaskTypeEntRefService.updateById(wmTaskTypeEntRef));
-	}
-
-	/**
-	 * 通过id删除药企给代理商设定积分规则
-	 *
-	 * @param id id
-	 * @return R
-	 */
-	@SysLog("通过id删除药企给代理商设定积分规则")
-	@DeleteMapping("/{id}")
-	//@PreAuthorize("@pms.hasPermission('admin_wmtasktypeentref_del')" )
-	public R removeById(@PathVariable Integer id) {
-		return R.ok(wmTaskTypeEntRefService.removeById(id));
-	}
-
-
-	/**
-	 * 获取药企列表
-	 *
-	 * @return 角色列表
-	 */
-	@GetMapping("/list")
-	public R listWmScorePackage(WmTaskTypeEntRef wmTaskTypeEntRef) {
-		wmTaskTypeEntRef.setDelFlag("0");
-		wmTaskTypeEntRef.setEnableFlag("0");
-		wmTaskTypeEntRef.setDrugentId(SecurityUtils.getUser().getDrugEntId());
-		return R.ok(wmTaskTypeEntRefService.list(Wrappers.query(wmTaskTypeEntRef)));
-	}
+    private final WmTaskTypeEntRefService wmTaskTypeEntRefService;
+    private final WmTaskTypeService wmTaskTypeService;
+    private final WmDaAgentService wmDaAgentService;
+    private final SysDeptService sysDeptService;
+    private final WmDaDrugEntService wmDaDrugEntService;
+
+    /**
+     * 分页查询
+     *
+     * @param page             分页对象
+     * @param wmTaskTypeEntRef 药企给代理商设定积分规则
+     * @return 分页结果
+     */
+    @GetMapping("/page")
+    public R<Page<WmTaskTypeEntRef>> getWmTaskTypeEntRefPage(Page<WmTaskTypeEntRef> page, WmTaskTypeEntRef wmTaskTypeEntRef) {
+        OrderItem orderItem = new OrderItem();
+        orderItem.setColumn("create_time");
+        orderItem.setAsc(false);
+        page.addOrder(orderItem);
+        WmDaDrugEnt drId = wmDaDrugEntService.selectByDeptId(SecurityUtils.getUser().getDeptId());
+        wmTaskTypeEntRef.setDrugentId((drId.getId()));
+        return R.ok(wmTaskTypeEntRefService.page(page, Wrappers.query(wmTaskTypeEntRef)));
+    }
+
+    /**
+     * 分页查询积分规则
+     *
+     * @param page    分页对象
+     * @param agentId 药企给代理商Id
+     * @return 分页结果
+     */
+    @GetMapping("/pages")
+    public R<Page<WmTaskTypeEntRef>> getWmTaskTypeEntRefPages(Page<WmTaskTypeEntRef> page,
+                                                              @RequestParam(value = "agentId", required = false) Integer agentId) {
+
+        if (Objects.isNull(agentId)) {
+            WmDaAgent anId = wmDaAgentService.selectByDeptId(SecurityUtils.getUser().getDeptId());
+            if (anId == null) {
+                return R.ok(page);
+            }
+            agentId = anId.getId();
+        }
+        return R.ok(wmTaskTypeEntRefService.page(page, Wrappers.<WmTaskTypeEntRef>lambdaQuery()
+                .eq(WmTaskTypeEntRef::getAgentId, agentId)
+                .isNotNull(WmTaskTypeEntRef::getDrugentId)
+                .orderByDesc(WmTaskTypeEntRef::getCreateTime)));
+    }
+
+
+    /**
+     * 通过id查询药企给代理商设定积分规则
+     *
+     * @param id id
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R<WmTaskTypeEntRef> getById(@PathVariable("id") Integer id) {
+        return R.ok(wmTaskTypeEntRefService.getById(id));
+    }
+
+
+    /**
+     * 新增药企给代理商设定积分规则
+     *
+     * @param wmTaskTypeEntRef 药企给代理商设定积分规则
+     * @return R
+     */
+    @SysLog("新增药企给代理商设定积分规则")
+    @PostMapping("/saves")
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> saves(@RequestBody WmTaskTypeEntRef wmTaskTypeEntRef) {
+
+        SysDept deptId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+        WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(deptId.getDeptId());
+
+        wmTaskTypeEntRef.setDrugentId(wmDaDrugEnt.getId());
+
+        WmTaskType wmTaskType = new WmTaskType();
+        wmTaskType.setDurgentId(wmTaskTypeEntRef.getDrugentId());
+        wmTaskType.setLevel1Id(wmTaskTypeEntRef.getAgentId());
+        wmTaskType.setDelFlag("0");
+        List<WmTaskType> list = wmTaskTypeService.list(Wrappers.query(wmTaskType));
+        WmDaAgent wmDaAgent = wmDaAgentService.getById(wmTaskTypeEntRef.getAgentId());
+        WmDaDrugEnt wmDaDrugEnt1 = wmDaDrugEntService.getById(wmTaskTypeEntRef.getDrugentId());
+        SysDept DrugEntDeptId = sysDeptService.getById(wmDaDrugEnt1.getDeptId());
+
+        if (CollUtil.isNotEmpty(list)) {
+
+            SysDept AgentDeptId = sysDeptService.getById(wmDaAgent.getDeptId());
+
+            if (AgentDeptId.getLevel() == 3) {
+                return R.failed("药企已分配一代积分规则");
+            }
+        } else if (null != wmDaAgent) {
+            wmTaskTypeEntRef.setDeptId(wmDaAgent.getDeptId().toString());
+        } else if (DrugEntDeptId.getLevel() == 2) {
+            return R.failed("药企只能分配积分规则");
+        }
+
+        wmTaskTypeEntRefService.save(wmTaskTypeEntRef);
+        WmTaskType wmTaskTypeQ = new WmTaskType();
+        wmTaskTypeQ.setTaskTypeLevel("1");
+        wmTaskTypeQ.setDelFlag("0");
+        wmTaskTypeQ.setStatus("0");
+        List<WmTaskType> tempList = wmTaskTypeService.list(Wrappers.query(wmTaskTypeQ));
+        List<WmTaskType> newList = new ArrayList<>();
+
+        for (WmTaskType wmTaskType1 : tempList) {
+            wmTaskType1.setId(null);
+            wmTaskType1.setLevel1Id(wmTaskTypeEntRef.getAgentId());
+            wmTaskType1.setDurgentId(wmTaskTypeEntRef.getDrugentId());
+            wmTaskType1.setTaskTypeLevel("2");
+            wmTaskType1.setTaskEntId(wmTaskTypeEntRef.getAgentId());
+            wmTaskType1.setDeptId(wmDaAgent.getDeptId());
+            wmTaskType1.setCreateTime(LocalDateTime.now());
+            wmTaskType1.setStatus("0");
+            wmTaskType1.setBaseId(wmTaskType1.getId());
+            wmTaskType1.setRuleId("" + wmTaskType1.getDurgentId() + wmTaskType1.getLevel1Id());
+            wmTaskType1.setParentId(wmTaskType1.getParentId());
+            newList.add(wmTaskType1);
+        }
+
+
+        wmTaskTypeService.saveBatch(newList);
+
+        return R.ok(Boolean.TRUE);
+    }
+
+
+    /**
+     * 修改药企给代理商设定积分规则
+     *
+     * @param wmTaskTypeEntRef 药企给代理商设定积分规则
+     * @return R
+     */
+    @SysLog("修改药企给代理商设定积分规则")
+    @PutMapping
+    public R<Boolean> updateById(@RequestBody WmTaskTypeEntRef wmTaskTypeEntRef) {
+        return R.ok(wmTaskTypeEntRefService.updateById(wmTaskTypeEntRef));
+    }
+
+    /**
+     * 通过id删除药企给代理商设定积分规则
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("通过id删除药企给代理商设定积分规则")
+    @DeleteMapping("/{id}")
+    public R<Boolean> removeById(@PathVariable Integer id) {
+        return R.ok(wmTaskTypeEntRefService.removeById(id));
+    }
+
+
+    /**
+     * 获取药企列表
+     *
+     * @return 角色列表
+     */
+    @GetMapping("/list")
+    public R<List<WmTaskTypeEntRef>> listWmScorePackage(WmTaskTypeEntRef wmTaskTypeEntRef) {
+        wmTaskTypeEntRef.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmTaskTypeEntRef.setEnableFlag(CommonConstants.STATUS_NORMAL);
+        wmTaskTypeEntRef.setDrugentId(SecurityUtils.getUser().getDrugEntId());
+        return R.ok(wmTaskTypeEntRefService.list(Wrappers.query(wmTaskTypeEntRef)));
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptInvoiceMapper.java

@@ -1,14 +1,14 @@
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author snows
 * @description 针对表【sys_dept_invoice(企业开票表)】的数据库操作Mapper
 * @createDate 2023-06-16 14:08:32
-* @Entity com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice
+* @Entity com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice
 */
 @Mapper
 public interface SysDeptInvoiceMapper extends BaseMapper<SysDeptInvoice> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptInvoiceRelationMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptInvoiceRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceRelationVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,7 +16,7 @@ import java.util.Set;
 * @author snows
 * @description 针对表【sys_dept_invoice_relation(企业开票关联表)】的数据库操作Mapper
 * @createDate 2023-06-16 14:28:24
-* @Entity com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation
+* @Entity com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation
 */
 @Mapper
 public interface SysDeptInvoiceRelationMapper extends BaseMapper<SysDeptInvoiceRelation> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptRechargeMapper.java

@@ -1,14 +1,14 @@
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author snows
 * @description 针对表【sys_dept_recharge(积分充值表)】的数据库操作Mapper
 * @createDate 2023-06-12 10:47:24
-* @Entity com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge
+* @Entity com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge
 */
 @Mapper
 public interface SysDeptRechargeMapper extends BaseMapper<SysDeptRecharge> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptRechargeRecordMapper.java

@@ -1,14 +1,14 @@
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author snows
 * @description 针对表【sys_dept_recharge_record(积分充值/使用记录表)】的数据库操作Mapper
 * @createDate 2023-06-12 14:40:23
-* @Entity com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord
+* @Entity com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord
 */
 @Mapper
 public interface SysDeptRechargeRecordMapper extends BaseMapper<SysDeptRechargeRecord> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskMapper.java

@@ -26,173 +26,181 @@ import java.util.Map;
  */
 @Mapper
 public interface WmTaskMapper extends DataScopeMapper<WmTask> {
-	public IPage<WmTask> selectListByExtEnt(Page page, @Param("query") WmTask wmTask);
+    IPage<WmTask> selectListByExtEnt(Page page, @Param("query") WmTask wmTask);
 
-	public IPage<WmTask> selectListByRelationScoreId(Page page, @Param("query") WmTask wmTask);
+    IPage<WmTask> selectListByRelationScoreId(Page page, @Param("query") WmTask wmTask);
 
-	public List<WmTask> selectListByExtEntNoPage(@Param("query") WmTask wmTask);
+    List<WmTask> selectListByExtEntNoPage(@Param("query") WmTask wmTask);
 
-	public List<Map<String, Object>> selectZbCount(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> selectZbCount(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIds(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIds(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIdsForJs(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsForJs(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIdsForJsUser(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsForJsUser(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIdsCount(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsCount(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIdsAndUser(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsAndUser(@Param("query") WmTask wmTask);
 
-	public List<Map<String,Object>> getTaskListByPackageIdsZd(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsZd(@Param("query") WmTask wmTask);
 
-	public List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(@Param("query") WmTask wmTask);
+    List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(@Param("query") WmTask wmTask);
 
-	public List<WmTask> selectListByWmTask(@Param("query")WmScorePackage wmScorePackage);
+    List<WmTask> selectListByWmTask(@Param("query") WmScorePackage wmScorePackage);
 
-	public IPage<Map<String,Object>> getH5PackageList(Page page, @Param("query") WmTask wmTask);
+    IPage<Map<String, Object>> getH5PackageList(Page page, @Param("query") WmTask wmTask);
 
-	public IPage<Map<String,Object>> getH5TaskList(Page page, @Param("query") WmTask wmTask);
+    IPage<Map<String, Object>> getH5TaskList(Page page, @Param("query") WmTask wmTask);
 
-	List<Map<String, Object>> selectByWmTaskOne(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> selectByWmTaskSecond(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> selectByWmTaskDrug(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> selectByReportOneApprovalStatus(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> selectByReportSecondApprovalStatus(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> selectByReportDrugApprovalStatus(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> selectByWmTaskOne(@Param("query") WmTask wmTask);
 
-	List<WmTask> selectByWmTaskId(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> selectByWmTaskSecond(@Param("query") WmTask wmTask);
 
-	int selectById(@Param("query") Long id);
+    List<Map<String, Object>> selectByWmTaskDrug(@Param("query") WmTask wmTask);
 
-	WmTask selectByRealFlag(Integer id);
+    List<Map<String, Object>> selectByReportOneApprovalStatus(@Param("query") WmTask wmTask);
 
-	WmTask selectWmTaskById(@Param("query") WmTask wmTask);
-	List<Map<String, Object>> saveAndUpdateWmTask(@Param("query") WmTask wmTask, WmReport wmReport);
+    List<Map<String, Object>> selectByReportSecondApprovalStatus(@Param("query") WmTask wmTask);
 
-	List<WmTask> selectListByIds(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> selectByReportDrugApprovalStatus(@Param("query") WmTask wmTask);
 
-	List<WmTask> selectListByScorePackageId(@Param("query") WmTask wmTask);
+    List<WmTask> selectByWmTaskId(@Param("query") WmTask wmTask);
 
-	public Page<WmTask> selectList(Page page, QueryWrapper wrappers);
+    int selectById(@Param("query") Long id);
 
-	 List<WmTask> selectByTask(@Param("query") WmTask wmTask);
+    WmTask selectByRealFlag(Integer id);
 
+    WmTask selectWmTaskById(@Param("query") WmTask wmTask);
 
-	 List<Map<String,Object>> getTaskListByIdsCount(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> saveAndUpdateWmTask(@Param("query") WmTask wmTask, WmReport wmReport);
 
-	 List<Map<String,Object>> getTaskListByIds(@Param("query") WmTask wmTask);
+    List<WmTask> selectListByIds(@Param("query") WmTask wmTask);
 
-	List<Map<String,Object>> getTaskListByIdsOld(@Param("query") WmTask wmTask);
+    List<WmTask> selectListByScorePackageId(@Param("query") WmTask wmTask);
 
+    Page<WmTask> selectList(Page page, QueryWrapper wrappers);
 
-	List<Map<String,Object>> getTaskListByIdsJs(@Param("query") WmTask wmTask);
+    List<WmTask> selectByTask(@Param("query") WmTask wmTask);
 
-	 List<WmTask> getTaskListByIdsReturnWmtaskInfo(@Param("query") WmTask wmTask);
 
-	 List<Map<String,Object>> getTaskListByIdsZd(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsCount(@Param("query") WmTask wmTask);
 
-	List<Map<String,Object>> getTaskListByIdsZdJs(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIds(@Param("query") WmTask wmTask);
 
-	 IPage<WmTask> getWmTaskList(Page page, @Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsOld(@Param("query") WmTask wmTask);
 
-	/**
-	 * 根据配置查询任务
-	 *
-	 * @param page
-	 * @param wmTask
-	 * @return
-	 */
- 	IPage<WmTask> listWmTaskByConfig(Page<WmTask> page, @Param("query") WmTask wmTask);
 
-	/**
-	 * 根据配置查询任务
-	 *
-	 * @param page
-	 * @param queryWrapper
-	 * @return
-	 */
-	IPage<WmTask> listWmTaskByWrapper(Page<WmTask> page, @Param(Constants.WRAPPER) QueryWrapper<WmTask> queryWrapper);
+    List<Map<String, Object>> getTaskListByIdsJs(@Param("query") WmTask wmTask);
 
-	List<Map<String,String>> PackageIsFinishByTask(@Param("query") WmTask wmTask);
+    List<WmTask> getTaskListByIdsReturnWmtaskInfo(@Param("query") WmTask wmTask);
 
-	Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsZd(@Param("query") WmTask wmTask);
 
-	IPage<Map<String,Object>> selectSettleTask(Page page, @Param("query") WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsZdJs(@Param("query") WmTask wmTask);
 
-	/**
-	 * 查询用户审核中和审核通过的积分
-	 * @param userId 用户id
-	 * @param startTime 开始时间
-	 * @param endTime 截止时间
-	 * @return 任务积分值和
-	 */
-	int getUserTaskSubScore(@Param("userId")String userId, @Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime);
+    IPage<WmTask> getWmTaskList(Page page, @Param("query") WmTask wmTask);
 
-	/**
-	 * 发包方审核时候只校验审核通过的分数
-	 * @param userId 用户id
-	 * @param startTime 开始时间
-	 * @param endTime 截止时间
-	 * @return 任务积分值和
-	 */
-	int newGetUserTaskSubScore(@Param("userId")String userId, @Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime);
+    /**
+     * 根据配置查询任务
+     *
+     * @param page
+     * @param wmTask
+     * @return
+     */
+    IPage<WmTask> listWmTaskByConfig(Page<WmTask> page, @Param("query") WmTask wmTask);
 
-	/**
-	 * 患者教育-处方列表
-	 *
-	 * @param page 分页条件
-	 * @param scorePackageId 积分包id
-	 * @param prescriptionNo 处方单编号
-	 * @return 处方列表分页
-	 */
-	IPage<WmTask> listTaskPrescriptionPage(Page page, @Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
-
-	/**
-	 * 患者教育-处方列表
-	 *
-	 * @param scorePackageId 积分包id
-	 * @param prescriptionNo 处方单编号
-	 * @return 处方列表
-	 */
-	List<WmTask> listTaskPrescription(@Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
-
-	/**
-	 * 查询调查信息审核列表
-	 *
-	 * @param wmTask
-	 * @param startDate
-	 * @param endDate
-	 * @return
-	 */
-	IPage<WmTask> listInfoAudit(Page page, @Param("query") WmTask wmTask, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
-
-	/**
-	 * 查询同一家医院一个月做的任务
-	 *
-	 * @param hospitalId
-	 * @return
-	 */
-	List<WmTask> listCurrentMonthHospitalTask(@Param("hospitalId") String hospitalId);
-
-	/**
-	 * 查询会议任务个数
-	 *
-	 * @param taskTypeList 任务类型列表
-	 * @param taskUserId 用户id
-	 * @param startTime 会议时间范围-开始
-	 * @param endTime 会议时间范围-结束
-	 * @return 会议任务个数
-	 */
-	Long countMeetingTask(@Param("taskTypeList") List<String> taskTypeList, @Param("taskUserId") String taskUserId,
-						  @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
-
-	/**
-	 * 企业审核查询任务列表
-	 *
-	 * @param page
-	 * @param wmReport
-	 * @return
-	 */
-	IPage<WmTaskVO> entTaskPageByTaskType(Page<WmTaskVO> page, @Param("query") Map<String, Object> wmReport);
+    /**
+     * 根据配置查询任务
+     *
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    IPage<WmTask> listWmTaskByWrapper(Page<WmTask> page, @Param(Constants.WRAPPER) QueryWrapper<WmTask> queryWrapper);
+
+    List<Map<String, String>> PackageIsFinishByTask(@Param("query") WmTask wmTask);
+
+    Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
+
+    IPage<Map<String, Object>> selectSettleTask(Page page, @Param("query") WmTask wmTask);
+
+    /**
+     * 查询用户审核中和审核通过的积分
+     *
+     * @param userId    用户id
+     * @param startTime 开始时间
+     * @param endTime   截止时间
+     * @return 任务积分值和
+     */
+    int getUserTaskSubScore(@Param("userId") String userId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 发包方审核时候只校验审核通过的分数
+     *
+     * @param userId    用户id
+     * @param startTime 开始时间
+     * @param endTime   截止时间
+     * @return 任务积分值和
+     */
+    int newGetUserTaskSubScore(@Param("userId") String userId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 患者教育-处方列表
+     *
+     * @param page           分页条件
+     * @param scorePackageId 积分包id
+     * @param prescriptionNo 处方单编号
+     * @return 处方列表分页
+     */
+    IPage<WmTask> listTaskPrescriptionPage(Page page, @Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
+
+    /**
+     * 患者教育-处方列表
+     *
+     * @param scorePackageId 积分包id
+     * @param prescriptionNo 处方单编号
+     * @return 处方列表
+     */
+    List<WmTask> listTaskPrescription(@Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
+
+    /**
+     * 查询调查信息审核列表
+     *
+     * @param wmTask
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<WmTask> listInfoAudit(Page page, @Param("query") WmTask wmTask, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+
+    /**
+     * 查询同一家医院一个月做的任务
+     *
+     * @param hospitalId
+     * @return
+     */
+    List<WmTask> listCurrentMonthHospitalTask(@Param("hospitalId") String hospitalId);
+
+    /**
+     * 查询会议任务个数
+     *
+     * @param taskTypeList 任务类型列表
+     * @param taskUserId   用户id
+     * @param startTime    会议时间范围-开始
+     * @param endTime      会议时间范围-结束
+     * @return 会议任务个数
+     */
+    Long countMeetingTask(@Param("taskTypeList") List<String> taskTypeList, @Param("taskUserId") String taskUserId,
+                          @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 企业审核查询任务列表
+     *
+     * @param page
+     * @param wmReport
+     * @return
+     */
+    IPage<WmTaskVO> entTaskPageByTaskType(Page<WmTaskVO> page, @Param("query") Map<String, Object> wmReport);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptInvoiceRelationService.java

@@ -1,7 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation;
 
 /**
 * @author snows

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptInvoiceService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptInvoiceRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceRelationVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceVO;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptRechargeRecordService.java

@@ -3,7 +3,7 @@ package com.qunzhixinxi.hnqz.admin.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeRecordForDeptVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeRecordVO;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptRechargeService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptRechargeRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeVO;
 
 /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaAgentService.java

@@ -21,13 +21,13 @@ public interface WmDaAgentService extends IService<WmDaAgent> {
 
 
 
-	public String getDeptBuildName(String deptId);
+	 String getDeptBuildName(String deptId);
 
-	public List<WmDaAgent> selectByScope(Wrapper<WmDaAgent> queryWrapper);
+	 List<WmDaAgent> selectByScope(Wrapper<WmDaAgent> queryWrapper);
 
-	public boolean saveAgent(WmDaAgent wmDaAgent);
+	 boolean saveAgent(WmDaAgent wmDaAgent);
 
-	public IPage<WmDaAgent> listPage(Page page, WmDaAgent wmDaAgent);
+	 IPage<WmDaAgent> listPage(Page page, WmDaAgent wmDaAgent);
 
 	WmDaAgent selectByDeptId(Integer deptId);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptInvoiceRelationServiceImpl.java

@@ -1,7 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptInvoiceRelationMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptInvoiceRelationService;
 import org.springframework.stereotype.Service;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptInvoiceServiceImpl.java

@@ -21,9 +21,9 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageStatusMapper;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptInvoiceRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceStatus;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptRechargeRecordServiceImpl.java

@@ -16,8 +16,8 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.DeptLevelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.PackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageStatusMapper;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordPackageType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeMapper;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptRechargeServiceImpl.java

@@ -11,8 +11,8 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DeptLevelEnum;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptRechargeRequest;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRechargeRecordService;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -482,7 +482,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                     newOne.setTaskTypeLevel("2");
                     newOne.setTaskEntId(wmTaskTypeEntRef.getAgentId());
                     newOne.setRuleId(wmTaskTypeEntRef.getAgentId().toString());
-                    newOne.setDeptId(wmDaAgent.getDeptId() + "");
+                    newOne.setDeptId(wmDaAgent.getDeptId());
                     newOne.setCreateTime(LocalDateTime.now());
                     newOne.setStatus("0");
                     newOne.setBaseId(wmTaskType1.getId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -1,16 +1,12 @@
-
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
@@ -19,6 +15,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,8 +24,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 档案-药企
@@ -43,7 +38,6 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	private final SysDeptService sysDeptService;
 	private final WmDaDrugEntMapper wmDaDrugEntMapper;
 	private final SysDeptRelationService sysDeptRelationService;
-	private final SysDeptSubMapper sysDeptSubMapper;
 	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
 	private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
 
@@ -140,14 +134,14 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			entity.setDeptId(sysDept.getDeptId());
 			wmDaDrugEntMapper.updateById(entity);
 
-			List<SysDeptRelation> newList = new ArrayList<>();
+			List<SysDeptRelation> newList = new ArrayList<>(2);
 			SysDeptRelation sysDeptRelation = new SysDeptRelation();
 			sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
-			sysDeptRelation.setDescendant(Integer.valueOf(entity.getDeptId()));
+			sysDeptRelation.setDescendant(entity.getDeptId());
 			newList.add(sysDeptRelation);
 			SysDeptRelation sysDeptRelation1 = new SysDeptRelation();
-			sysDeptRelation1.setAncestor(Integer.valueOf(entity.getDeptId()));
-			sysDeptRelation1.setDescendant(Integer.valueOf(entity.getDeptId()));
+			sysDeptRelation1.setAncestor(entity.getDeptId());
+			sysDeptRelation1.setDescendant(entity.getDeptId());
 			newList.add(sysDeptRelation1);
 			sysDeptRelationService.saveBatch(newList);
 
@@ -156,19 +150,6 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			// 初始化企业的任务类型配置的信息
 			taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(sysDept.getDeptId()));
 
-			// 创建结算渠道和通道
-//			if (CollUtil.isNotEmpty(entity.getSubjectTypeAndChannel())) {
-//				for (Map.Entry<String, Integer> entry : entity.getSubjectTypeAndChannel().entrySet()) {
-//					SysDeptSub deptSub = new SysDeptSub();
-//					deptSub.setDeptId(sysDept.getDeptId());
-//					deptSub.setSubjectType(entry.getKey());
-//					deptSub.setSubjectChannel(entry.getValue());
-//					deptSub.setUpdateTime(LocalDateTime.now());
-//					deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-//					sysDeptSubMapper.insert(deptSub);
-//				}
-//			}
-
 			return true;
 		}
 		return false;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -43,8 +43,8 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SettleStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TaskStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordPackageType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeMapper;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskSubmissionRuleServiceImpl.java

@@ -35,87 +35,81 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class WmTaskSubmissionRuleServiceImpl extends ServiceImpl<WmTaskSubmissionRuleMapper, WmTaskSubmissionRule> implements WmTaskSubmissionRuleService {
 
-	private final SysDictItemMapper sysDictItemMapper;
-
-	/**
-	 * 获取部门限制信息
-	 *
-	 * @param deptId 部门id
-	 * @return 限制信息
-	 */
-	@Override
-	public Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> listDeptTaskSubmissionRules(Integer deptId) {
-
-		Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> result = new LinkedHashMap<>();
-		List<WmTaskSubmissionRule> rules = this.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
-				.eq(WmTaskSubmissionRule::getDeptId, deptId));
-
-		Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> taskCategoryListMap = rules.stream()
-				.collect(Collectors.groupingBy(rule -> rule.getSubCategory().getCategory()));
-
-		// 结果根据字典顺序排列
-		List<SysDictItem> taskCategorys = sysDictItemMapper.selectList(Wrappers.<SysDictItem>lambdaQuery()
-				.eq(SysDictItem::getType, "task_category")
-				.eq(SysDictItem::getDelFlag, DelEnum.NOT_DEL.val()));
-
-		taskCategorys.forEach(taskCate -> {
-			UpmsType.TaskCategory taskCategory = Enum.valueOf(UpmsType.TaskCategory.class, taskCate.getValue());
-			result.put(taskCategory, taskCategoryListMap.get(taskCategory));
-		});
-
-		return result;
-	}
-
-	/**
-	 * 初始化企业限制信息
-	 *
-	 * @param deptIds 企业id
-	 * @return 初始化结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean initDeptTaskSubmissionRule(Collection<Integer> deptIds) {
-		// 基于平台数据初始化
-		return this.initDeptTaskSubmissionRule(deptIds, CommonConstants.TENANT_ID_1);
-	}
-
-	/**
-	 * 初始化企业限制信息（基于前企业数据）
-	 *
-	 * @param deptIds 企业id集合
-	 * @param sourceDeptId 源数据企业id
-	 * @return 初始化结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean initDeptTaskSubmissionRule(Collection<Integer> deptIds, Integer sourceDeptId) {
-		log.info("初始化企业限制信息deptIds={}, sourceDeptId={}", deptIds, sourceDeptId);
-
-		// 查询源数据企业的配置
-		List<WmTaskSubmissionRule> platformRules = this.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
-				.eq(WmTaskSubmissionRule::getDeptId, sourceDeptId));
-
-
-		if (CollUtil.isEmpty(platformRules)) {
-			return Boolean.FALSE;
-		}
-
-
-		List<WmTaskSubmissionRule> deptRules = new ArrayList<>(deptIds.size() * platformRules.size());
-
-
-		deptIds.forEach(deptId -> {
-			platformRules.forEach(r -> {
-				WmTaskSubmissionRule deptRule = new WmTaskSubmissionRule();
-				deptRule.setRule(r.getRule());
-				deptRule.setDeptId(deptId);
-				deptRule.setOptFlag(r.getOptFlag());
-				deptRule.setSubCategory(r.getSubCategory());
-				deptRules.add(deptRule);
-			});
-
-		});
-
-		return this.saveBatch(deptRules);
-	}
+    private final SysDictItemMapper sysDictItemMapper;
+
+    /**
+     * 获取部门限制信息
+     *
+     * @param deptId 部门id
+     * @return 限制信息
+     */
+    @Override
+    public Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> listDeptTaskSubmissionRules(Integer deptId) {
+
+        Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> result = new LinkedHashMap<>();
+        List<WmTaskSubmissionRule> rules = this.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
+                .eq(WmTaskSubmissionRule::getDeptId, deptId));
+
+        Map<UpmsType.TaskCategory, List<WmTaskSubmissionRule>> taskCategoryListMap = rules.stream()
+                .collect(Collectors.groupingBy(rule -> rule.getSubCategory().getCategory()));
+
+        // 结果根据字典顺序排列
+        List<SysDictItem> taskCategorys = sysDictItemMapper.selectList(Wrappers.<SysDictItem>lambdaQuery()
+                .eq(SysDictItem::getType, "task_category")
+                .eq(SysDictItem::getDelFlag, DelEnum.NOT_DEL.val()));
+
+        taskCategorys.forEach(taskCate -> {
+            UpmsType.TaskCategory taskCategory = Enum.valueOf(UpmsType.TaskCategory.class, taskCate.getValue());
+            result.put(taskCategory, taskCategoryListMap.get(taskCategory));
+        });
+
+        return result;
+    }
+
+    /**
+     * 初始化企业限制信息
+     *
+     * @param deptIds 企业id
+     * @return 初始化结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean initDeptTaskSubmissionRule(Collection<Integer> deptIds) {
+        // 基于平台数据初始化
+        return this.initDeptTaskSubmissionRule(deptIds, CommonConstants.TENANT_ID_1);
+    }
+
+    /**
+     * 初始化企业限制信息（基于前企业数据）
+     *
+     * @param deptIds      企业id集合
+     * @param sourceDeptId 源数据企业id
+     * @return 初始化结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean initDeptTaskSubmissionRule(Collection<Integer> deptIds, Integer sourceDeptId) {
+        log.info("初始化企业限制信息deptIds={}, sourceDeptId={}", deptIds, sourceDeptId);
+
+        // 查询源数据企业的配置
+        List<WmTaskSubmissionRule> platformRules = this.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery().eq(WmTaskSubmissionRule::getDeptId, sourceDeptId));
+
+        if (CollUtil.isEmpty(platformRules)) {
+            return Boolean.FALSE;
+        }
+
+        List<WmTaskSubmissionRule> deptRules = new ArrayList<>(deptIds.size() * platformRules.size());
+
+        deptIds.forEach(deptId -> platformRules.forEach(r -> {
+            WmTaskSubmissionRule deptRule = new WmTaskSubmissionRule();
+            deptRule.setRule(r.getRule());
+            deptRule.setDeptId(deptId);
+            log.info("opt_flag:[{}], rule:[{}]", r.getOptFlag(), r);
+            deptRule.setOptFlag(r.getOptFlag());
+            deptRule.setSubCategory(r.getSubCategory());
+            deptRules.add(deptRule);
+        }));
+        log.info("dept_rules:{}", deptRules);
+        return this.saveBatch(deptRules);
+    }
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptInvoiceRelationMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.SysDeptInvoiceRelationMapper">
 
-    <resultMap id="BaseResultMap" type="com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoiceRelation">
+    <resultMap id="BaseResultMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysDeptInvoiceRelation">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="invoiceId" column="invoice_id" jdbcType="INTEGER"/>
             <result property="deptId" column="dept_id" jdbcType="INTEGER"/>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaAgentMapper.xml

@@ -46,7 +46,7 @@
         #{sbjnzm,jdbcType=VARCHAR}, #{frsfzzmZm,jdbcType=VARCHAR}, #{frsfzzmBm,jdbcType=VARCHAR},
         #{frsfzzmSc,jdbcType=VARCHAR}, #{zjType,jdbcType=VARCHAR}, #{zjNumber,jdbcType=VARCHAR},
         #{jsAccount,jdbcType=VARCHAR}, #{isExamine,jdbcType=VARCHAR}, #{extDrugEnt,jdbcType=VARCHAR},
-        #{temp1,jdbcType=VARCHAR}, #{temp2,jdbcType=VARCHAR}, #{deptId,jdbcType=VARCHAR},
+        #{temp1,jdbcType=VARCHAR}, #{temp2,jdbcType=VARCHAR}, #{deptId},
         #{delFlag,jdbcType=VARCHAR}, #{enableFlag,jdbcType=VARCHAR},
         #{tenantId,jdbcType=BIGINT},#{createTime,jdbcType=VARCHAR},
         #{createUser,jdbcType=BIGINT}, #{updateTime,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR},
@@ -187,7 +187,7 @@
         left join sys_dept d
         on a.dept_id = d.dept_id
         where
-        a.dept_id = #{deptId,jdbcType=VARCHAR}
+        a.dept_id = #{deptId}
     </select>
 
     <select id="selectDeptId1" resultType="map">
@@ -207,11 +207,11 @@
         ext_drug_ent = #{extDrugEnt,jdbcType=VARCHAR}
     </select>
 
-    <select id="selectByDeptId" resultMap="wmDaAgentMap" parameterType="java.lang.String">
+    <select id="selectByDeptId" resultMap="wmDaAgentMap">
         select
         *
         from wm_da_agent
-        where dept_id = #{deptId,jdbcType=VARCHAR}
+        where dept_id = #{deptId}
     </select>
 
 
@@ -219,7 +219,7 @@
         select
         *
         from wm_da_agent
-        where dept_id = #{deptId,jdbcType=VARCHAR}
+        where dept_id = #{deptId}
     </select>
 
 
@@ -274,7 +274,7 @@
         select
         *
         from wm_da_agent
-        where dept_id = #{deptId,jdbcType=VARCHAR}
+        where dept_id = #{deptId}
     </select>
 
     <select id="selectWmDaDrugEntByDeptIds" resultMap="wmDaAgentMap" parameterType="java.util.HashMap">
@@ -283,7 +283,7 @@
         left join wm_relation r on r.down_id=d.dept_id
         where r.up_id = #{upId,jdbcType=INTEGER}
         UNION
-        select * from wm_da_agent where dept_id= #{deptId,jdbcType=VARCHAR}
+        select * from wm_da_agent where dept_id= #{deptId}
 
     </select>
 
@@ -328,7 +328,7 @@
         select *
         from
         wm_da_agent
-        where dept_id= #{deptId,jdbcType=VARCHAR}
+        where dept_id= #{deptId}
     </select>
 
     <!-- 根据sys_dept表的level字段查询 -->

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskSubRuleMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmTaskSubmissionRuleMapper">
+
+    <resultMap id="BaseResultMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule">
+        <id property="ruleId" column="rule_id" jdbcType="INTEGER"/>
+        <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
+        <result property="subCategory" column="sub_cate" jdbcType="VARCHAR"/>
+        <result property="rule" column="sub_rule" jdbcType="OTHER"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="optFlag" column="opt_flag" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+</mapper>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskTypeMapper.xml

@@ -4,72 +4,72 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper">
 
-  <resultMap id="wmTaskTypeMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType">
-                  <id property="id" column="id"/>
-                        <result property="taskTypeName" column="task_type_name"/>
-                        <result property="taskTypeLevel" column="task_type_level"/>
-	  					<result property="status" column="status"/>
-	  					<result property="score" column="score"/>
-	  					<result property="baseId" column="base_id"/>
-	  					<result property="taskScoreStart" column="task_score_start"/>
-                        <result property="taskScoreEnd" column="task_score_end"/>
-						<result property="taskEntId" column="task_ent_id"/>
-	  					<result property="durgentId" column="durgent_id"/>
-	  					<result property="level1Id" column="level1_id"/>
-                        <result property="delFlag" column="del_flag"/>
-                        <result property="enableFlag" column="enable_flag"/>
-                        <result property="tenantId" column="tenant_id"/>
-                        <result property="createTime" column="create_time"/>
-                        <result property="createUser" column="create_user"/>
-                        <result property="updateTime" column="update_time"/>
-                        <result property="updateUser" column="update_user"/>
-	  					<result property="realFlag" column="real_flag"/>
-	 					<result property="ruleId" column="rule_id"/>
-	 					<result property="parentId" column="parent_id"/>
-  </resultMap>
+    <resultMap id="wmTaskTypeMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType">
+        <id property="id" column="id"/>
+        <result property="taskTypeName" column="task_type_name"/>
+        <result property="taskTypeLevel" column="task_type_level"/>
+        <result property="status" column="status"/>
+        <result property="score" column="score"/>
+        <result property="baseId" column="base_id"/>
+        <result property="taskScoreStart" column="task_score_start"/>
+        <result property="taskScoreEnd" column="task_score_end"/>
+        <result property="taskEntId" column="task_ent_id"/>
+        <result property="durgentId" column="durgent_id"/>
+        <result property="level1Id" column="level1_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateUser" column="update_user"/>
+        <result property="realFlag" column="real_flag"/>
+        <result property="ruleId" column="rule_id"/>
+        <result property="parentId" column="parent_id"/>
+    </resultMap>
 
-	<select id="getTaskTypeDeptList" resultType="com.qunzhixinxi.hnqz.admin.api.model.output.WmTaskTypeDeptOutput" >
-		SELECT durgent_id ,level1_id ,rule_id  from wm_task_type
-		where dept_id = #{query.deptId,jdbcType=VARCHAR}
-		GROUP BY rule_id
-	</select>
+    <select id="getTaskTypeDeptList" resultType="com.qunzhixinxi.hnqz.admin.api.model.output.WmTaskTypeDeptOutput">
+        SELECT durgent_id ,level1_id ,rule_id from wm_task_type
+        where dept_id = #{query.deptId}
+        GROUP BY rule_id
+    </select>
 
-	<select id="selectByRuleId" resultMap="wmTaskTypeMap" parameterType="java.lang.String" >
-		select
-		*
-		from wm_task_type
-		where rule_id = #{ruleId,jdbcType=VARCHAR}
-	</select>
+    <select id="selectByRuleId" resultMap="wmTaskTypeMap" parameterType="java.lang.String">
+        select
+        *
+        from wm_task_type
+        where rule_id = #{ruleId,jdbcType=VARCHAR}
+    </select>
 
-	<select id="getWmTaskType" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
-		select
-		t.task_type_name as taskTypeName,
-		t.id as taskTypeId,
-		'1' as type
-		from wm_task_type  t
-		where t.del_flag='0' and t.enable_flag=0
-		and t.task_type_level=1
-		<if test="query.parentId!=null and query.parentId!=''">
-			AND t.parent_id =#{query.parentId}
-		</if>
-		order by t.id
+    <select id="getWmTaskType" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
+        select
+        t.task_type_name as taskTypeName,
+        t.id as taskTypeId,
+        '1' as type
+        from wm_task_type t
+        where t.del_flag='0' and t.enable_flag=0
+        and t.task_type_level=1
+        <if test="query.parentId!=null and query.parentId!=''">
+            AND t.parent_id =#{query.parentId}
+        </if>
+        order by t.id
 
-	</select>
+    </select>
 
-	<select id="getWmTaskTypeYX" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
-		select
-		t.task_type_name as taskTypeName,
-		t.id as taskTypeId,
-		'1' as type
-		from wm_task_type  t
-		where t.del_flag='0' and t.enable_flag=0
-		and t.task_type_level=1
-		<if test="query.parentId!=null and query.parentId!=''">
-			AND t.parent_id =#{query.parentId}
-		</if>
-		order by t.id
+    <select id="getWmTaskTypeYX" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
+        select
+        t.task_type_name as taskTypeName,
+        t.id as taskTypeId,
+        '1' as type
+        from wm_task_type t
+        where t.del_flag='0' and t.enable_flag=0
+        and t.task_type_level=1
+        <if test="query.parentId!=null and query.parentId!=''">
+            AND t.parent_id =#{query.parentId}
+        </if>
+        order by t.id
 
-	</select>
+    </select>
 
 
 </mapper>

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -14,14 +14,12 @@ import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRelationMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaAgentMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
-import com.qunzhixinxi.hnqz.admin.util.AmountToCNUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -93,7 +91,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setDurgentId(wmDaDrugEnt.getId());
 				newOne.setTaskTypeLevel("2");
 				newOne.setTaskEntId(wmDaDrugEnt.getId());
-				newOne.setDeptId(wmDaDrugEnt.getDeptId().toString());
+				newOne.setDeptId(wmDaDrugEnt.getDeptId());
 				newOne.setStatus("0");
 				newOne.setBaseId(wmTaskType1.getId());
 				newOne.setRuleId(wmDaDrugEnt.getId().toString());
@@ -143,7 +141,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setTaskTypeLevel("2");
 					newOne.setRuleId(""+wmDaDrugEnt.getId() + wmDaAgent.getId());
 					newOne.setTaskEntId(wmDaAgent.getId());
-					newOne.setDeptId(wmDaAgent.getDeptId().toString());
+					newOne.setDeptId(wmDaAgent.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType1.getId());
 					newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
@@ -166,7 +164,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setTaskTypeLevel("2");
 					newOne.setTaskEntId(wmDaAgent.getId());
 					newOne.setRuleId(wmDaAgent.getId().toString());
-					newOne.setDeptId(wmDaAgent.getDeptId().toString());
+					newOne.setDeptId(wmDaAgent.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
 					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
@@ -203,7 +201,7 @@ public class WmTaskTypeServiceTest {
 						newOne.setTaskTypeLevel("2");
 						newOne.setTaskEntId(wmDaAgent2.getId());
 						newOne.setRuleId(wmDaAgent2.getId().toString());
-						newOne.setDeptId(wmDaAgent2.getDeptId().toString());
+						newOne.setDeptId(wmDaAgent2.getDeptId());
 						newOne.setStatus("0");
 						newOne.setBaseId(wmTaskType2.getId());
 						newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
@@ -253,7 +251,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setTaskTypeLevel("2");
 				newOne.setTaskEntId(wmDaAgent.getId());
 				newOne.setRuleId(wmDaAgent.getId().toString());
-				newOne.setDeptId(wmDaAgent.getDeptId().toString());
+				newOne.setDeptId(wmDaAgent.getDeptId());
 				newOne.setStatus("0");
 				newOne.setBaseId(wmTaskType2.getId());
 				newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
@@ -290,7 +288,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setTaskTypeLevel("2");
 					newOne.setTaskEntId(wmDaAgent2.getId());
 					newOne.setRuleId(wmDaAgent2.getId().toString());
-					newOne.setDeptId(wmDaAgent2.getDeptId().toString());
+					newOne.setDeptId(wmDaAgent2.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
 					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());