Merge remote-tracking branch 'origin/master'

# Conflicts:
#	test-api/src/main/java/com/sooka/service/impl/Guiji_Funeral_ServiceImpl.java

test-api/src/main/java/com/sooka/model/bo/Guiji_funeral1_the_dead_Bean.java

@@ -50,6 +50,7 @@ public class Guiji_funeral1_the_dead_Bean extends BaseBean_Guiji {
     //登记单位
     String OPERDW;
 
+
 //    String param;//业务条码、
 //    String param;//逝者姓名、
 //    String param;//身份证号、

test-api/src/main/java/com/sooka/service/impl/Guiji_Funeral_ServiceImpl.java

@@ -62,7 +62,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             bean.setOPERID(new String (Base64.decode(Data.getString("OPERID")),"UTF-8"));
             bean.setOPERDW(new String (Base64.decode(Data.getString("OPERDW")),"UTF-8"));
 
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -104,7 +103,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             System.out.println(Data+"=Data");
             bean.setStr(str);
             bean.setId(Data.getString("id"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral2(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral2(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -146,7 +144,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             System.out.println(Data+"=Data");
             bean.setStr(str);
             bean.setId(Data.getString("id"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral3(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral3(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -188,7 +185,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             System.out.println(Data+"=Data");
             bean.setStr(str);
             bean.setId(Data.getString("id"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral4(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral4(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -219,7 +215,7 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "\t59777051-f848-4f7d-843b-d127e7138bd1");
+            log.put("interfaceinfoId", "59777051-f848-4f7d-843b-d127e7138bd1");
             log.put("interfaceinfoName", "归集-市殡葬-骨灰续存基本信息");
             Guiji_funeral5_ashes_renew_Bean bean = new Guiji_funeral5_ashes_renew_Bean();
             initBaseGuijiBean(str, bean);
@@ -228,7 +224,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             System.out.println(Data+"=Data");
             bean.setStr(str);
             bean.setId(Data.getString("id"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral4(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral4(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -270,7 +265,6 @@ public class Guiji_Funeral_ServiceImpl extends BaseService implements Guiji_Fune
             System.out.println(Data+"=Data");
             bean.setStr(str);
             bean.setId(Data.getString("id"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_funeral_mapper.add_guiji_funeral4(bean);
 //            guiji_funeral_mapper2.add_guiji_funeral4(bean);
             if (bean.getCd_operation().equals("I")) {

test-api/src/main/java/com/sooka/service/impl/Guiji_Medicine_ServiceImpl.java

@@ -46,7 +46,6 @@ public class Guiji_Medicine_ServiceImpl extends BaseService implements Guiji_Med
             bean.setProduceTons(Data.getString("produceTons"));
             bean.setProduceValue(Data.getString("produceValue"));
             bean.setPlantYear(Data.getString("plantYear"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_medicine_mapper.add_guiji_medicine_dept_data(bean);
 //            guiji_medicine_mapper2.add_guiji_medicine_dept_data(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -96,7 +95,6 @@ public class Guiji_Medicine_ServiceImpl extends BaseService implements Guiji_Med
             bean.setPlatformAddressExt(Data.getString("platformAddressExt"));
             bean.setPlatformLevel(Data.getString("platformLevel"));
             bean.setPlatformType(Data.getString("platformType"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_medicine_mapper.add_guiji_medicine_dept_data2(bean);
 //            guiji_medicine_mapper2.add_guiji_medicine_dept_data2(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -146,7 +144,6 @@ public class Guiji_Medicine_ServiceImpl extends BaseService implements Guiji_Med
             bean.setProjectTotalInvestment(Data.getString("projectTotalInvestment"));
             bean.setProjectStart(Data.getString("projectStart"));
             bean.setProjectEnd(Data.getString("projectEnd"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_medicine_mapper.add_guiji_medicine_dept_data3(bean);
 //            guiji_medicine_mapper2.add_guiji_medicine_dept_data3(bean);
             if (bean.getCd_operation().equals("I")) {
@@ -195,7 +192,6 @@ public class Guiji_Medicine_ServiceImpl extends BaseService implements Guiji_Med
             bean.setNumber(Data.getString("number"));
             bean.setYearOnYear(Data.getString("yearOnYear"));
             bean.setCityProportion(Data.getString("cityProportion"));
-//            bean.setEvent_laliyuan(Data.getString("event_laliyuan"));
 //            guiji_medicine_mapper.add_guiji_medicine_dept_data4(bean);
 //            guiji_medicine_mapper2.add_guiji_medicine_dept_data4(bean);
             if (bean.getCd_operation().equals("I")) {

test-api/src/main/resources/mapper/Guiji_Funeral_Mapper.xml

@@ -94,7 +94,7 @@
 
 
     <insert id="add_guiji_funeral2" parameterType="com.sooka.model.bo.Guiji_funeral2_pay_Bean">
-        insert into t_guiji_medicine_platform (
+        insert into t_guiji_funeral_pay (
         <include refid="global_name"></include>
         platformName, constructingUnit, constructingDate, platformAddress, platformAddressExt, platformLevel, platformType)
         values (
@@ -103,7 +103,7 @@
     </insert>
 
     <update id="update_guiji_funeral2" parameterType="com.sooka.model.bo.Guiji_funeral2_pay_Bean">
-        update t_guiji_medicine_platform
+        update t_guiji_funeral_pay
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="platformName != null and platformName != ''">
@@ -133,7 +133,7 @@
 
 
     <insert id="add_guiji_funeral3" parameterType="com.sooka.model.bo.Guiji_funeral3_freeze_Bean">
-        insert into t_guiji_medicine_project (
+        insert into t_guiji_funeral_freeze (
         <include refid="global_name"></include>
         projectName, projectOrgName, projectAddress, projectStatus, projectTotalInvestment, projectStart, projectEnd)
         values (
@@ -142,7 +142,7 @@
     </insert>
 
     <update id="update_guiji_funeral3" parameterType="com.sooka.model.bo.Guiji_funeral3_freeze_Bean">
-        update t_guiji_medicine_project
+        update t_guiji_funeral_freeze
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="projectName != null and projectName != ''">
@@ -172,7 +172,7 @@
 
 
     <insert id="add_guiji_funeral4" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
-        insert into t_guiji_medicine_industry (
+        insert into t_guiji_funeral_ashes_storage (
         <include refid="global_name"></include>
         year, month, economyType, number, yearOnYear, cityProportion)
         values (
@@ -181,7 +181,79 @@
     </insert>
 
     <update id="update_guiji_funeral4" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
-        update t_guiji_medicine_industry
+        update t_guiji_funeral_ashes_storage
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="year != null and year != ''">
+                year = #{year},
+            </if>
+            <if test="month != null and month != ''">
+                month = #{month},
+            </if>
+            <if test="economyType != null and economyType != ''">
+                economyType = #{economyType},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="yearOnYear != null and yearOnYear != ''">
+                yearOnYear = #{yearOnYear},
+            </if>
+            <if test="cityProportion != null and cityProportion != ''">
+                cityProportion = #{cityProportion},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
+    <insert id="add_guiji_funeral5" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        insert into t_guiji_funeral_ashes_renew (
+        <include refid="global_name"></include>
+        year, month, economyType, number, yearOnYear, cityProportion)
+        values (
+        <include refid="global_value"></include>
+        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+    </insert>
+
+    <update id="update_guiji_funeral5" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        update t_guiji_funeral_ashes_renew
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="year != null and year != ''">
+                year = #{year},
+            </if>
+            <if test="month != null and month != ''">
+                month = #{month},
+            </if>
+            <if test="economyType != null and economyType != ''">
+                economyType = #{economyType},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="yearOnYear != null and yearOnYear != ''">
+                yearOnYear = #{yearOnYear},
+            </if>
+            <if test="cityProportion != null and cityProportion != ''">
+                cityProportion = #{cityProportion},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
+    <insert id="add_guiji_funeral6" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        insert into t_guiji_funeral_ashes_remove (
+        <include refid="global_name"></include>
+        year, month, economyType, number, yearOnYear, cityProportion)
+        values (
+        <include refid="global_value"></include>
+        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+    </insert>
+
+    <update id="update_guiji_funeral6" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        update t_guiji_funeral_ashes_remove
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="year != null and year != ''">

test-api/src/main/resources/mapper/Guiji_Funeral_Mapper2.xml

@@ -94,7 +94,7 @@
 
 
     <insert id="add_guiji_funeral2" parameterType="com.sooka.model.bo.Guiji_funeral2_pay_Bean">
-        insert into t_guiji_medicine_platform (
+        insert into t_guiji_funeral_pay (
         <include refid="global_name"></include>
         platformName, constructingUnit, constructingDate, platformAddress, platformAddressExt, platformLevel, platformType)
         values (
@@ -103,7 +103,7 @@
     </insert>
 
     <update id="update_guiji_funeral2" parameterType="com.sooka.model.bo.Guiji_funeral2_pay_Bean">
-        update t_guiji_medicine_platform
+        update t_guiji_funeral_pay
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="platformName != null and platformName != ''">
@@ -133,7 +133,7 @@
 
 
     <insert id="add_guiji_funeral3" parameterType="com.sooka.model.bo.Guiji_funeral3_freeze_Bean">
-        insert into t_guiji_medicine_project (
+        insert into t_guiji_funeral_freeze (
         <include refid="global_name"></include>
         projectName, projectOrgName, projectAddress, projectStatus, projectTotalInvestment, projectStart, projectEnd)
         values (
@@ -142,7 +142,7 @@
     </insert>
 
     <update id="update_guiji_funeral3" parameterType="com.sooka.model.bo.Guiji_funeral3_freeze_Bean">
-        update t_guiji_medicine_project
+        update t_guiji_funeral_freeze
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="projectName != null and projectName != ''">
@@ -172,7 +172,7 @@
 
 
     <insert id="add_guiji_funeral4" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
-        insert into t_guiji_medicine_industry (
+        insert into t_guiji_funeral_ashes_storage (
         <include refid="global_name"></include>
         year, month, economyType, number, yearOnYear, cityProportion)
         values (
@@ -181,7 +181,79 @@
     </insert>
 
     <update id="update_guiji_funeral4" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
-        update t_guiji_medicine_industry
+        update t_guiji_funeral_ashes_storage
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="year != null and year != ''">
+                year = #{year},
+            </if>
+            <if test="month != null and month != ''">
+                month = #{month},
+            </if>
+            <if test="economyType != null and economyType != ''">
+                economyType = #{economyType},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="yearOnYear != null and yearOnYear != ''">
+                yearOnYear = #{yearOnYear},
+            </if>
+            <if test="cityProportion != null and cityProportion != ''">
+                cityProportion = #{cityProportion},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
+    <insert id="add_guiji_funeral5" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        insert into t_guiji_funeral_ashes_renew (
+        <include refid="global_name"></include>
+        year, month, economyType, number, yearOnYear, cityProportion)
+        values (
+        <include refid="global_value"></include>
+        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+    </insert>
+
+    <update id="update_guiji_funeral5" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        update t_guiji_funeral_ashes_renew
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="year != null and year != ''">
+                year = #{year},
+            </if>
+            <if test="month != null and month != ''">
+                month = #{month},
+            </if>
+            <if test="economyType != null and economyType != ''">
+                economyType = #{economyType},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="yearOnYear != null and yearOnYear != ''">
+                yearOnYear = #{yearOnYear},
+            </if>
+            <if test="cityProportion != null and cityProportion != ''">
+                cityProportion = #{cityProportion},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
+    <insert id="add_guiji_funeral6" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        insert into t_guiji_funeral_ashes_remove (
+        <include refid="global_name"></include>
+        year, month, economyType, number, yearOnYear, cityProportion)
+        values (
+        <include refid="global_value"></include>
+        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+    </insert>
+
+    <update id="update_guiji_funeral6" parameterType="com.sooka.model.bo.Guiji_funeral4_ashes_storage_Bean">
+        update t_guiji_funeral_ashes_remove
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="year != null and year != ''">