merge

atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java

@@ -259,4 +259,6 @@ public interface ProjectMapper extends MyMapper {
      * @return
      */
     public List<TemplateQueryDto> getTemplateCode(@Param("type")String type, @Param("name")String name);
+
+    int insertOnWhere(Project record);
 }
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/ProjectExtendsMapper.xml

@@ -47,7 +47,32 @@
         and o.parent_id = #{orgId,jdbcType=VARCHAR}
     </select>
 
-  <insert id="insertOnWhere" parameterType="pwc.taxtech.atms.entity.Project">
+
+    <select id="getTemplateCode"  resultType="pwc.taxtech.atms.entity.TemplateQueryDto">
+
+        SELECT
+        *
+        FROM
+        (SELECT
+        t.code,
+        t.name,
+        p.`pay_tax_type`
+        FROM
+        template t
+        LEFT JOIN template_group p
+        ON p.id = t.template_group_id) m
+        WHERE 1 = 1
+        <if test="name != null and  name != '' ">
+            AND m.name = #{name}
+        </if>
+
+        <if test="type != null and  type != '' ">
+            AND m.pay_tax_type = #{type}
+        </if>
+
+    </select>
+
+    <insert id="insertOnWhere" parameterType="pwc.taxtech.atms.entity.Project">
     insert into project (id, code, name,
     year, client_code, is_active,
     create_time, update_time, region_id,
@@ -74,33 +99,7 @@
       is_active = 1
     )
 
-<<<<<<< HEAD
   </insert>
-=======
-    <select id="getTemplateCode"  resultType="pwc.taxtech.atms.entity.TemplateQueryDto">
->>>>>>> 0e707ae17266bb0035246f93c27c44ccbf687b27
-
-        SELECT
-        *
-        FROM
-        (SELECT
-        t.code,
-        t.name,
-        p.`pay_tax_type`
-        FROM
-        template t
-        LEFT JOIN template_group p
-        ON p.id = t.template_group_id) m
-        WHERE 1 = 1
-        <if test="name != null and  name != '' ">
-            AND m.name = #{name}
-        </if>
-
-        <if test="type != null and  type != '' ">
-            AND m.pay_tax_type = #{type}
-        </if>
-
-    </select>
 
 
 </mapper>
\ No newline at end of file