Merge remote-tracking branch 'origin/dev' into dev

carbon-back/carbon-back-service/src/main/resources/carbon/CollectiveFarmerMapper.xml

@@ -1,6 +1,6 @@
 <?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="CollectiveFarmerMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.CollectiveFarmerMapper">
     <resultMap id="BaseResultMap" type="CollectiveFarmer">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId"/>
@@ -21,7 +21,7 @@
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
-        <collection property="farmerInfos" column="guid" select="FarmerInfoMapper.selectByCollectiveId" />
+        <collection property="farmerInfos" column="guid" select="com.hcloud.microserver.system.bank.dao.FarmerInfoMapper.selectByCollectiveId" />
     </resultMap>
 
     <sql id="Base_Column_List">

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerCompanyTypeMapper.xml

@@ -1,6 +1,6 @@
 <?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="CustomerCompanyTypeMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerCompanyTypeMapper">
   <resultMap id="BaseResultMap" type="CustomerCompanyType">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="parent_id" jdbcType="CHAR" property="parentId" />

carbon-back/carbon-back-service/src/main/resources/carbon/FarmerInfoMapper.xml

@@ -1,6 +1,6 @@
 <?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="FarmerInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.FarmerInfoMapper">
     <resultMap id="BaseResultMap" type="FarmerInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId"/>
@@ -28,7 +28,7 @@
         <result column="bank_clearing_msg" jdbcType="VARCHAR" property="bankClearingMsg"/>
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
-        <association property="povertyArea" column="fk_poverty_area_id" select="PovertyAreaMapper.selectByPrimaryKey"/>
+        <association property="povertyArea" column="fk_poverty_area_id" select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
     </resultMap>
     <sql id="Base_Column_List">
         guid, fk_poverty_area_id, fk_collective_id, farmer_code, farmer_name, family_num,

carbon-back/carbon-back-service/src/main/resources/carbon/PovertyAreaMapper.xml

@@ -1,7 +1,7 @@
 <?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="PovertyAreaMapper">
-    <resultMap id="BaseResultMap" type="PovertyArea">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.PovertyArea">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="poverty_area_name" jdbcType="VARCHAR" property="povertyAreaName"/>
         <result column="area_address" jdbcType="VARCHAR" property="areaAddress"/>

carbon-back/carbon-back-service/src/main/resources/carbon/ProductExpansionMapper.xml

@@ -1,6 +1,6 @@
 <?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="ProductExpansionMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.ProductExpansionMapper">
     <resultMap id="BaseResultMap" type="ProductExpansion">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_product_guid" jdbcType="CHAR" property="fkProductGuid"/>

carbon-back/carbon-back-service/src/main/resources/carbon/ProductInfoMapper.xml

@@ -1,7 +1,7 @@
 <?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="ProductInfoMapper">
-    <resultMap id="BaseResultMap" type="ProductInfo">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.ProductInfoMapper">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_product_type" jdbcType="CHAR" property="fkProductType"/>
         <result column="fk_carbon_rule" jdbcType="CHAR" property="fkCarbonRule"/>
@@ -21,13 +21,13 @@
         <result column="modified_user" jdbcType="CHAR" property="modifiedUser"/>
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
         <association property="productType" column="fk_product_type"
-                     select="ProductTypeMapper.selectByPrimaryKey"/>
+                     select="com.hcloud.microserver.system.bank.dao.ProductTypeMapper.selectByPrimaryKey"/>
         <association property="povertyArea" column="fk_poverty_area"
-                     select="PovertyAreaMapper.selectByPrimaryKey"/>
+                     select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
         <collection property="productExpansions" column="guid"
-                    select="ProductExpansionMapper.selectByProductGuid"/>
+                    select="com.hcloud.microserver.system.bank.dao.ProductExpansionMapper.selectByProductGuid"/>
         <collection property="productBelongs" column="guid"
-                    select="ProductBelongMapper.selectByProductGuid"/>
+                    select="com.hcloud.microserver.system.bank.dao.ProductBelongMapper.selectByProductGuid"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -45,7 +45,7 @@
         delete from t_product_info
         where guid = #{guid,jdbcType=CHAR}
     </delete>
-    <insert id="insert" parameterType="ProductInfo">
+    <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         insert into t_product_info (guid, fk_product_type, fk_carbon_rule,
         fk_poverty_area, product_name, product_code,
         carbon_generate_date, product_validate_num, carbon_refresh_time,
@@ -61,7 +61,7 @@
         #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP}
         )
     </insert>
-    <insert id="insertSelective" parameterType="ProductInfo">
+    <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         insert into t_product_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="guid != null">
@@ -176,7 +176,7 @@
             </if>
         </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="ProductInfo">
+    <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         update t_product_info
         <set>
             <if test="fkProductType != null">
@@ -233,7 +233,7 @@
         </set>
         where guid = #{guid,jdbcType=CHAR}
     </update>
-    <update id="updateByPrimaryKey" parameterType="ProductInfo">
+    <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
         update t_product_info
         set fk_product_type = #{fkProductType,jdbcType=CHAR},
         fk_carbon_rule = #{fkCarbonRule,jdbcType=CHAR},
@@ -256,26 +256,26 @@
     </update>
 
 
-    <select id="selectListByPage" parameterType="ProductInfoForm" resultMap="BaseResultMap">
+    <select id="selectListByPage" parameterType="com.hcloud.microserver.system.facade.carbon.forms.ProductInfoForm" resultMap="BaseResultMap">
         select
-            product.guid,
-            product.fk_product_type,
-            product.fk_carbon_rule,
-            product.fk_poverty_area,
-            product.product_name,
-            product.product_code,
-            product.carbon_generate_date,
-            product.product_validate_num,
-            product.carbon_refresh_time,
-            product.carbon_sink,
-            product.product_imgs,
-            product.is_enable,
-            product.remark,
-            product.state,
-            product.create_user,
-            product.create_time,
-            product.modified_user,
-            product.modified_time
+        product.guid,
+        product.fk_product_type,
+        product.fk_carbon_rule,
+        product.fk_poverty_area,
+        product.product_name,
+        product.product_code,
+        product.carbon_generate_date,
+        product.product_validate_num,
+        product.carbon_refresh_time,
+        product.carbon_sink,
+        product.product_imgs,
+        product.is_enable,
+        product.remark,
+        product.state,
+        product.create_user,
+        product.create_time,
+        product.modified_user,
+        product.modified_time
         from t_product_info product
         <where>
             product.state = 1
@@ -338,7 +338,7 @@
         update t_product_info set state = 0
         where fk_product_type = #{productTypeGuid,jdbcType=VARCHAR}
     </update>
-    
+
     <select id="selectProductGuidsByFarmerGuids" parameterType="list" resultType="string">
         select fk_product_guid from t_product_belong
         where state = 1 and fk_farmer_guid in
@@ -347,4 +347,30 @@
         </foreach>
         group by fk_product_guid;
     </select>
+
+    <!-- 查询产品详情 lym -->
+    <!--<select id="findById" parameterType="String" resultMap="BaseResultMap">
+        select
+            product.guid,
+            product.fk_product_type,
+            product.fk_carbon_rule,
+            product.fk_poverty_area,
+            product.product_name,
+            product.product_code,
+            product.carbon_generate_date,
+            product.product_validate_num,
+            product.carbon_refresh_time,
+            product.carbon_sink,
+            product.product_imgs,
+            product.is_enable,
+            product.remark,
+            product.state,
+            product.create_user,
+            product.create_time,
+            product.modified_user,
+            product.modified_time
+            from t_product_info product
+            WHERE product.state = 1
+            AND product.guid = #{guid}
+    </select>-->
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeExpansionMapper.xml

@@ -1,6 +1,6 @@
 <?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="ProductTypeExpansionMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.ProductTypeExpansionMapper">
     <resultMap id="BaseResultMap" type="ProductTypeExpansion">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_product_type_guid" jdbcType="CHAR" property="fkProductTypeGuid"/>

carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeMapper.xml

@@ -1,6 +1,6 @@
 <?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="ProductTypeMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.ProductTypeMapper">
     <resultMap id="BaseResultMap" type="ProductType">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="parent_id" jdbcType="CHAR" property="parentId"/>
@@ -10,7 +10,7 @@
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
         <result column="methodology" jdbcType="VARCHAR" property="methodology"/>
         <result column="type_desc" jdbcType="VARCHAR" property="typeDesc"/>
-        <collection property="productTypeExpansions" column="guid" select="ProductTypeExpansionMapper.selectByProductTypeGuid"/>
+        <collection property="productTypeExpansions" column="guid" select="com.hcloud.microserver.system.bank.dao.ProductTypeExpansionMapper.selectByProductTypeGuid"/>
     </resultMap>
     <sql id="Base_Column_List">
         guid, parent_id, type_name, type_val, state, modified_time, methodology, type_desc