Procházet zdrojové kódy

修改金额新增日志

anderx před 2 roky
rodič
revize
1a16299347

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountDetailsMapper.java

@@ -24,4 +24,6 @@ public interface ExpenseAccountDetailsMapper {
     List<OutExpenseAccountDetails> selectByEAid(Integer eaid);
 
     void deleteByeaid(Integer updateType);
+
+    Integer selectExpenseAccountById(Integer id);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -66,4 +66,6 @@ public interface ExpenseAccountMapper {
     List<MainExpenseAccount> selectSonByMainIds(List<Integer> list);
 
     void updateSonByMainId(Integer id);
+
+    MainExpenseAccount selectbySonId(Integer id);
 }

+ 6 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountDetailsMapper.xml

@@ -310,8 +310,13 @@
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     FROM expense_account_details a WHERE eaid= #{eaid}
   </select>
-  <delete id="deleteByeaid">
+    <delete id="deleteByeaid">
     delete from expense_account_details
     where eaid = #{id}
   </delete>
+  <select id="selectExpenseAccountById" resultType="java.lang.Integer">
+    select b.id
+    from expense_account_details a left join expense_relationship b on a.eaid =b.ea_id
+    where a.id= #{id}
+  </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -1030,5 +1030,17 @@
       #{id}
     </foreach>
   </select>
+    <select id="selectbySonId" resultMap="MainMap">
+  select b.id id,
+  c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount,c.real_amount sonRealAmount,
+  c.`type` sonType,c.type_other sonTypeOTher, c.user_names ,c.release_start ,c.release_end,
+  c.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
+  from expense_relationship a
+  left join expense_account b on a.id =b.id
+  left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
+  left join t_order_new o on b.order_no =o.order_no left join expense_account c on a.ea_id =c.id
+  left join admin ad on b.aid=ad.id left join department adDep on ad.department_id=adDep.id
+  where c.id in (#{id})
+  </select>
 
 </mapper>

+ 9 - 6
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -875,12 +875,15 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     @Override
     public Object updateRealAmount(Integer type, Integer id, BigDecimal amount) {
-            ExpenseAccountDetails ea= new ExpenseAccountDetails();
-            ea.setId(id);
-            ea.setRealAmount(amount);
-            expenseAccountDetailsMapper.updateByPrimaryKeySelective(ea);
-            expenseAccountMapper.updateSonByDetId(id);
-            expenseAccountMapper.updateMainByDetId(id);
+        ExpenseAccountDetails ea= new ExpenseAccountDetails();
+        ea.setId(id);
+        ea.setRealAmount(amount);
+        String name=TokenManager.getAdminToken().getName();
+        Integer eaid = expenseAccountDetailsMapper.selectExpenseAccountById(id);
+        addExpenseAccountLog(eaid,5,3,TokenManager.getAdminId(),String.format("财务[%s]修改实际报销金额为%s。",name,amount));
+        expenseAccountDetailsMapper.updateByPrimaryKeySelective(ea);
+        expenseAccountMapper.updateSonByDetId(id);
+        expenseAccountMapper.updateMainByDetId(id);
         return 1;
     }
 

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20