Browse Source

报销开发

anderx 2 years ago
parent
commit
c88bd7e155

+ 12 - 4
src/main/java/com/goafanti/common/mapper/ExpenseRelationshipMapper.xml

@@ -19,13 +19,18 @@
     delete from expense_relationship
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseRelationship" useGeneratedKeys="true">
-    insert into expense_relationship (ea_id, create_time)
-    values (#{eaId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
+  <insert id="insert" parameterType="com.goafanti.common.model.ExpenseRelationship">
+    insert into expense_relationship (id, ea_id, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{eaId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseRelationship" useGeneratedKeys="true">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.ExpenseRelationship">
     insert into expense_relationship
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="eaId != null">
         ea_id,
       </if>
@@ -34,6 +39,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
       <if test="eaId != null">
         #{eaId,jdbcType=INTEGER},
       </if>

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -258,7 +258,7 @@ public class ExpenseAccountController extends CertifyApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"合并编号"));
             return  res;
         }
-        return res.data(expenseAccountService.merge(ids));
+        return res.data(expenseAccountService.pushMerge(ids));
     }
 
 }

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -40,5 +40,5 @@ public interface ExpenseAccountService {
 
     Object selectByCheckNo(String checkNo);
 
-    Object merge(String ids);
+    Object pushMerge(String ids);
 }

+ 2 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -684,7 +684,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     @Override
-    public Object merge(String ids) {
+    public Object pushMerge(String ids) {
         String[] split = ids.split(",");
         List<String> list = Arrays.asList(split);
         List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByIds(list);
@@ -712,6 +712,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             er.setEaId(e.getId());
             expenseRelationshipMapper.insert(er);
         });
+        in.setTotalAmount(count.get());
         expenseAccountMapper.insertSelective(in);
         expenseAccountMapper.updateByIds(list,1);
         addExpenseAccountExamine(in.getId());