Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise into master

yxt_supervise/pom.xml

@@ -15,6 +15,7 @@
         <module>supervise-supplychain</module>
         <module>supervise-system</module>
         <module>yxt_adapter</module>
+        <module>supervise-rmc</module>
     </modules>
     <packaging>pom</packaging>
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountMapper">
     <select id="spdhmxb" resultType="java.util.Map">
-        SELECT NAME,proCode,proName, number ,   packageTotalPrice   ptotalPrice, prodNum , prodValue ,
+        SELECT name,proCode,proName, number ,   packageTotalPrice   ptotalPrice, prodNum , prodValue ,
                number-prodNum  ztnumber,
                IF((  packageTotalPrice  -  prodValue  )>0,  packageTotalPrice  -  prodValue  ,0) ztprodValue1,
                IF((  prodValue -  packageTotalPrice  )>0,  prodValue  - packageTotalPrice  ,0) ztprodValue2
@@ -11,8 +11,7 @@
                         (SELECT  CONVERT(IFNULL(SUM(prodNum),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`) ) prodNum,
                         (SELECT  CONVERT(IFNULL(SUM(prodValue),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`)  ) prodValue
                 FROM `supplier_bank_info` sbi
-                         LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified
+                         LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified  LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
-                         LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
                 WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1
                 GROUP BY pr.supplierOnlyCode,prp.`proCode`  ORDER BY sbi.name,prp.`proCode`) t
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java

@@ -545,7 +545,7 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
 				}
 			}catch(Exception e){
 				e.printStackTrace();
-				System.err.println("i="+i+",value=null");
+				System.err.println("i="+i+",rowNum="+rowNum);
 			}
 
 			//aaa+=1;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java

@@ -32,7 +32,7 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     @Select("select * from purchase_requisition  ")
     List<PurchaseRequisition> selectAll();
     @Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " +
-            " (SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE  gic.colex=pr.supplierOnlyCode " +
+            " (SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode " +
             " and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," +
             " MAX(pr.`arrivalDate`) arrivalDate " +
             " FROM `supplier_bank_info` sbi  " +

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml

@@ -1,5 +0,0 @@
-<?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.yxt.supervise.portal.biz.riskindicatorslevel.RiskIndicatorsLevelMapper">
-
-</mapper>

yxt_supervise/supervise-rmc/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>supervise-rmc</artifactId>
+    <modules>
+        <module>supervise-rmc-api</module>
+        <module>supervise-rmc-biz</module>
+    </modules>
+    <groupId>com.yxt.supervise</groupId>
+    <version>0.0.1</version>
+
+    <packaging>pom</packaging>
+    <description>风险管理中心</description>
+
+
+</project>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risk/Risk.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risk/Risk.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risk;
+package com.supervise.rmc.api.risk;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risk/RiskDto.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risk/RiskDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risk;
+package com.supervise.rmc.api.risk;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risk/RiskFeign.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risk/RiskFeign.java

@@ -1,6 +1,5 @@
-package com.yxt.supervise.portal.api.risk;
+package com.supervise.rmc.api.risk;
 
-import com.yxt.supervise.portal.api.salesdata.SalesDataFeignFallback;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risk/RiskFeignFallback.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risk/RiskFeignFallback.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risk;
+package com.supervise.rmc.api.risk;
 
 import org.springframework.stereotype.Component;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risk/RiskVo.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risk/RiskVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risk;
+package com.supervise.rmc.api.risk;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicators/RiskIndicators.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicators/RiskIndicators.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicators;
+package com.supervise.rmc.api.riskindicators;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicators/RiskIndicatorsDto.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicators/RiskIndicatorsDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicators;
+package com.supervise.rmc.api.riskindicators;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicators/RiskIndicatorsFeign.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicators/RiskIndicatorsFeign.java

@@ -1,6 +1,5 @@
-package com.yxt.supervise.portal.api.riskindicators;
+package com.supervise.rmc.api.riskindicators;
 
-import com.yxt.supervise.portal.api.salesdata.SalesDataFeignFallback;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicators/RiskIndicatorsFeignFallback.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicators/RiskIndicatorsFeignFallback.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicators;
+package com.supervise.rmc.api.riskindicators;
 
 import org.springframework.stereotype.Component;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicators/RiskIndicatorsVo.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicators/RiskIndicatorsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicators;
+package com.supervise.rmc.api.riskindicators;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorslevel/RiskIndicatorsLevel.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorslevel/RiskIndicatorsLevel.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorslevel;
+package com.supervise.rmc.api.riskindicatorslevel;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorslevel/RiskIndicatorsLevelDto.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorslevel/RiskIndicatorsLevelDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorslevel;
+package com.supervise.rmc.api.riskindicatorslevel;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorslevel;
+package com.supervise.rmc.api.riskindicatorslevel;
 
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorslevel;
+package com.supervise.rmc.api.riskindicatorslevel;
 
 import org.springframework.stereotype.Component;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorslevel/RiskIndicatorsLevelVo.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorslevel/RiskIndicatorsLevelVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorslevel;
+package com.supervise.rmc.api.riskindicatorslevel;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorstype/RiskIndicatorsType.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorstype/RiskIndicatorsType.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorstype;
+package com.supervise.rmc.api.riskindicatorstype;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorstype/RiskIndicatorsTypeDto.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorstype/RiskIndicatorsTypeDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorstype;
+package com.supervise.rmc.api.riskindicatorstype;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorstype/RiskIndicatorsTypeFeign.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorstype/RiskIndicatorsTypeFeign.java

@@ -1,6 +1,6 @@
-package com.yxt.supervise.portal.api.riskindicatorstype;
+package com.supervise.rmc.api.riskindicatorstype;
 
-import com.yxt.supervise.portal.api.riskindicatorslevel.RiskIndicatorsLevelFeignFallback;
+import com.supervise.rmc.api.riskindicatorslevel.RiskIndicatorsLevelFeignFallback;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorstype;
+package com.supervise.rmc.api.riskindicatorstype;
 
 import org.springframework.stereotype.Component;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/riskindicatorstype/RiskIndicatorsTypeVo.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/riskindicatorstype/RiskIndicatorsTypeVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.riskindicatorstype;
+package com.supervise.rmc.api.riskindicatorstype;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risklist/RiskList.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risklist/RiskList.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risklist;
+package com.supervise.rmc.api.risklist;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risklist/RiskListDto.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risklist/RiskListDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risklist;
+package com.supervise.rmc.api.risklist;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risklist/RiskListFeign.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risklist/RiskListFeign.java

@@ -1,6 +1,6 @@
-package com.yxt.supervise.portal.api.risklist;
+package com.supervise.rmc.api.risklist;
 
-import com.yxt.supervise.portal.api.riskindicatorstype.RiskIndicatorsTypeFeignFallback;
+import com.supervise.rmc.api.riskindicatorstype.RiskIndicatorsTypeFeignFallback;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risklist/RiskListFeignFallback.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risklist/RiskListFeignFallback.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risklist;
+package com.supervise.rmc.api.risklist;
 
 import org.springframework.stereotype.Component;
 

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/risklist/RiskListVo.java → yxt_supervise/supervise-rmc/supervise-rmc-api/src/main/java/com/supervise/rmc/api/risklist/RiskListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.portal.api.risklist;
+package com.supervise.rmc.api.risklist;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risk/RiskMapper.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risk/RiskMapper.java

@@ -23,10 +23,10 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.portal.biz.risk;
+package com.supervise.rmc.biz.risk;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.risklist.RiskList;
+import com.supervise.rmc.api.risklist.RiskList;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risk/RiskMapper.xml → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risk/RiskMapper.xml

@@ -1,5 +1,5 @@
 <?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.yxt.supervise.portal.biz.risk.RiskMapper">
+<mapper namespace="com.supervise.rmc.biz.risk.RiskMapper">
 
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risk/RiskRest.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risk/RiskRest.java

@@ -1,13 +1,13 @@
-package com.yxt.supervise.portal.biz.risk;
+package com.supervise.rmc.biz.risk;
 
-import com.yxt.supervise.portal.api.risk.RiskFeign;
+import com.supervise.rmc.api.risk.RiskFeign;
-import com.yxt.supervise.portal.api.risklist.RiskListFeign;
+import com.supervise.rmc.api.risklist.RiskListFeign;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "风险名单表")
-@RestController("com.yxt.supervise.portal.biz.risk.RiskRest")
+@RestController("com.supervise.rmc.biz.risk.RiskRest")
 @RequestMapping("v1/risk")
 public class RiskRest implements RiskFeign {
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risk/RiskService.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risk/RiskService.java

@@ -1,8 +1,8 @@
-package com.yxt.supervise.portal.biz.risk;
+package com.supervise.rmc.biz.risk;
 
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.risklist.RiskList;
+import com.supervise.rmc.api.risklist.RiskList;
 import org.springframework.stereotype.Service;
 
 @Service

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicators/RiskIndicatorsMapper.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicators/RiskIndicatorsMapper.java

@@ -23,10 +23,10 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.portal.biz.riskindicators;
+package com.supervise.rmc.biz.riskindicators;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicators.RiskIndicators;
+import com.supervise.rmc.api.riskindicators.RiskIndicators;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicators/RiskIndicatorsMapper.xml → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicators/RiskIndicatorsMapper.xml

@@ -1,5 +1,5 @@
 <?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.yxt.supervise.portal.biz.riskindicators.RiskIndicatorsMapper">
+<mapper namespace="com.supervise.rmc.biz.riskindicators.RiskIndicatorsMapper">
 
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicators/RiskIndicatorsRest.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicators/RiskIndicatorsRest.java

@@ -1,13 +1,13 @@
-package com.yxt.supervise.portal.biz.riskindicators;
+package com.supervise.rmc.biz.riskindicators;
 
-import com.yxt.supervise.portal.api.risk.RiskFeign;
+import com.supervise.rmc.api.risk.RiskFeign;
-import com.yxt.supervise.portal.api.riskindicators.RiskIndicatorsFeign;
+import com.supervise.rmc.api.riskindicators.RiskIndicatorsFeign;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "风险指标表")
-@RestController("com.yxt.supervise.portal.biz.riskindicators.RiskIndicatorsRest")
+@RestController("com.supervise.rmc.biz.riskindicators.RiskIndicatorsRest")
 @RequestMapping("v1/riskIndicators")
 public class RiskIndicatorsRest implements RiskIndicatorsFeign {
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicators/RiskIndicatorsService.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicators/RiskIndicatorsService.java

@@ -1,8 +1,8 @@
-package com.yxt.supervise.portal.biz.riskindicators;
+package com.supervise.rmc.biz.riskindicators;
 
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicators.RiskIndicators;
+import com.supervise.rmc.api.riskindicators.RiskIndicators;
 import org.springframework.stereotype.Service;
 
 @Service

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java

@@ -23,10 +23,10 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.portal.biz.riskindicatorslevel;
+package com.supervise.rmc.biz.riskindicatorslevel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicatorslevel.RiskIndicatorsLevel;
+import com.supervise.rmc.api.riskindicatorslevel.RiskIndicatorsLevel;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml

@@ -0,0 +1,5 @@
+<?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.supervise.rmc.biz.riskindicatorslevel.RiskIndicatorsLevelMapper">
+
+</mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java

@@ -1,12 +1,12 @@
-package com.yxt.supervise.portal.biz.riskindicatorslevel;
+package com.supervise.rmc.biz.riskindicatorslevel;
 
-import com.yxt.supervise.portal.api.risk.RiskFeign;
+import com.supervise.rmc.api.risk.RiskFeign;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "风险名单表")
-@RestController("com.yxt.supervise.portal.biz.riskindicatorslevel.RiskIndicatorsLevelRest")
+@RestController("com.supervise.rmc.biz.riskindicatorslevel.RiskIndicatorsLevelRest")
 @RequestMapping("v1/risk")
 public class RiskIndicatorsLevelRest implements RiskFeign {
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorslevel/RiskIndicatorsLevelService.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorslevel/RiskIndicatorsLevelService.java

@@ -1,8 +1,8 @@
-package com.yxt.supervise.portal.biz.riskindicatorslevel;
+package com.supervise.rmc.biz.riskindicatorslevel;
 
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicatorslevel.RiskIndicatorsLevel;
+import com.supervise.rmc.api.riskindicatorslevel.RiskIndicatorsLevel;
 import org.springframework.stereotype.Service;
 
 @Service

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java

@@ -23,10 +23,10 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.portal.biz.riskindicatorstype;
+package com.supervise.rmc.biz.riskindicatorstype;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicatorstype.RiskIndicatorsType;
+import com.supervise.rmc.api.riskindicatorstype.RiskIndicatorsType;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml

@@ -1,5 +1,5 @@
 <?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.yxt.supervise.portal.biz.riskindicatorstype.RiskIndicatorsTypeMapper">
+<mapper namespace="com.supervise.rmc.biz.riskindicatorstype.RiskIndicatorsTypeMapper">
 
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorstype/RiskIndicatorsTypeRest.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorstype/RiskIndicatorsTypeRest.java

@@ -1,12 +1,12 @@
-package com.yxt.supervise.portal.biz.riskindicatorstype;
+package com.supervise.rmc.biz.riskindicatorstype;
 
-import com.yxt.supervise.portal.api.risk.RiskFeign;
+import com.supervise.rmc.api.risk.RiskFeign;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "风险名单表")
-@RestController("com.yxt.supervise.portal.biz.riskindicatorstype.RiskIndicatorsTypeRest")
+@RestController("com.supervise.rmc.biz.riskindicatorstype.RiskIndicatorsTypeRest")
 @RequestMapping("v1/risk")
 public class RiskIndicatorsTypeRest implements RiskFeign {
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/riskindicatorstype/RiskIndicatorsTypeService.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/riskindicatorstype/RiskIndicatorsTypeService.java

@@ -1,8 +1,8 @@
-package com.yxt.supervise.portal.biz.riskindicatorstype;
+package com.supervise.rmc.biz.riskindicatorstype;
 
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.supervise.portal.api.risk.Risk;
+import com.supervise.rmc.api.risk.Risk;
-import com.yxt.supervise.portal.api.riskindicatorstype.RiskIndicatorsType;
+import com.supervise.rmc.api.riskindicatorstype.RiskIndicatorsType;
 import org.springframework.stereotype.Service;
 
 @Service

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risklist/RiskListMapper.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risklist/RiskListMapper.java

@@ -23,9 +23,9 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.portal.biz.risklist;
+package com.supervise.rmc.biz.risklist;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.supervise.portal.api.risklist.RiskList;
+import com.supervise.rmc.api.risklist.RiskList;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risklist/RiskListMapper.xml → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risklist/RiskListMapper.xml

@@ -1,5 +1,5 @@
 <?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.yxt.supervise.portal.biz.risklist.RiskListMapper">
+<mapper namespace="com.supervise.rmc.biz.risklist.RiskListMapper">
 
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risklist/RiskListRest.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risklist/RiskListRest.java

@@ -1,12 +1,12 @@
-package com.yxt.supervise.portal.biz.risklist;
+package com.supervise.rmc.biz.risklist;
 
-import com.yxt.supervise.portal.api.risklist.RiskListFeign;
+import com.supervise.rmc.api.risklist.RiskListFeign;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "风险名单表")
-@RestController("com.yxt.supervise.portal.biz.risklist.RiskListRest")
+@RestController("com.supervise.rmc.biz.risklist.RiskListRest")
 @RequestMapping("v1/riskList")
 public class RiskListRest implements RiskListFeign {
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/risklist/RiskListService.java → yxt_supervise/supervise-rmc/supervise-rmc-biz/src/main/java/com/supervise/rmc/biz/risklist/RiskListService.java

@@ -1,7 +1,7 @@
-package com.yxt.supervise.portal.biz.risklist;
+package com.supervise.rmc.biz.risklist;
 
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.supervise.portal.api.risklist.RiskList;
+import com.supervise.rmc.api.risklist.RiskList;
 import org.springframework.stereotype.Service;
 
 @Service