fix: 企业关联关系 支持 结算渠道

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysEnterpriseRelationVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 企业关系vo
@@ -27,6 +28,7 @@ public class SysEnterpriseRelationVO implements Serializable {
 	private UpmsType.EnterpriseType entType;
 	private UpmsType.ProductLine productLine;
 	private UpmsLevel.EnterpriseLevel entLevel;
+	private List<SysEnterpriseServiceChargeVO> serviceCharges;
 
 
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysEnterpriseServiceChargeVO.java

@@ -0,0 +1,24 @@
+package com.qunzhixinxi.hnqz.admin.api.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 企业服务费率
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2022-11-02 15:53
+ */
+@Data
+@ToString
+public class SysEnterpriseServiceChargeVO implements Serializable {
+	private static final long serialVersionUID = 6688063328094811017L;
+
+	private Integer entId;
+	private String subjectLocation;
+	private BigDecimal serviceCharge;
+}

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

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.input.SettleAmountMonitorInput;
 import com.qunzhixinxi.hnqz.admin.entity.output.SettleAmountMonitorOutput;
@@ -40,4 +41,7 @@ public interface SysDeptSubMapper extends BaseMapper<SysDeptSub> {
 	List<SettleAmountMonitorOutput> getDeptAmountMonitor(@Param("query") SettleAmountMonitorInput input);
 
 	List<SettleAmountMonitorOutput> getYaoyiAmountMonitor(@Param("query") SettleAmountMonitorInput yaoyiMonitorInput);
+
+
+	List<SysEnterpriseServiceChargeVO> listSysEnterpriseServiceCharge(@Param("deptId") Integer deptId);
 }

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

@@ -55,6 +55,8 @@
 		<result property="entType" column="ent_type"/>
 		<result property="productLine" column="product_line"/>
 		<result property="entLevel" column="ent_level"/>
+		<collection property="serviceCharges" ofType="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO"
+					select="com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper.listSysEnterpriseServiceCharge" column="ent_id"/>
 	</resultMap>
 
 	<select id="selectDistinctDeptId" resultMap="sysDeptMap">

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

@@ -15,6 +15,12 @@
 		<result property="enableFlag" column="enable_flag"/>
 	</resultMap>
 
+	<resultMap id="serviceChargeMap" type="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO">
+		<id property="entId" column="ent_id"/>
+		<result property="subjectLocation" column="subject_location"/>
+		<result property="serviceCharge" column="service_charge"/>
+	</resultMap>
+
 	<select id="getSettleAmountMonitor" resultType="com.qunzhixinxi.hnqz.admin.entity.output.SettleAmountMonitorOutput">
 		SELECT
 		t.id_card_number,
@@ -76,4 +82,12 @@
 		GROUP BY t.id_card_number
 	</select>
 
+	<select id="listSysEnterpriseServiceCharge" resultMap="serviceChargeMap">
+		SELECT ds.dept_id AS `ent_id`,
+			   ds.subject_location ,
+			   ds.service_charge
+		FROM  sys_dept_sub ds
+		WHERE ds.dept_id = #{deptId}
+	</select>
+
 </mapper>