1.资金账户添加日志

2.结账反结账添加日志
3.其他收支表账户名称修改

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -50,6 +50,10 @@ public enum  BillCodeSeq {
 
     FUNDTRANSFER ("资金转存","FundTransfer"),
 
+    ENDPRODUCT ("结账", "ENDPRODUCT"),
+
+    UNENDPRODUCT ("反结账", "UNENDPRODUCT"),
+
     BOM("BOM资料", "Bom");
 
 

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/EndProductServiceImpl.java

@@ -69,7 +69,7 @@ public class EndProductServiceImpl implements EndProductService {
         endProductMapper.end(map);
         endProductMapper.updatePeriodStatus(99L, period, BaseContextHolder.getCompanyId());
         DocBaseDTO docBaseDTO = generateMsgObj(Long.parseLong(period));
-        messageLogService.customizeLog(docBaseDTO, Operation.ENDPRODUCT);
+        messageLogService.customizeLog(new DocBaseDTO(Long.valueOf(period), period, "ENDPRODUCT"), Operation.ENDPRODUCT);
         return String.valueOf(map.get("result"));
     }
 
@@ -90,7 +90,7 @@ public class EndProductServiceImpl implements EndProductService {
             endProductMapper.updateRe(period, BaseContextHolder.getCompanyId());
             endProductMapper.updatePa(period, BaseContextHolder.getCompanyId());
             endProductMapper.updatePeriodStatus(0L, period, BaseContextHolder.getCompanyId());
-            messageLogService.customizeLog(generateMsgObj(Long.parseLong(period)), Operation.UNENDPRODUCT);
+            messageLogService.customizeLog(new DocBaseDTO(Long.valueOf(period), period, "UNENDPRODUCT"), Operation.UNENDPRODUCT);
         }
     }
     /**

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -58,6 +58,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformation.setCreatorId(BaseContextHolder.getUserId());
         bankinformation.setCreatorName(BaseContextHolder.getUserName());
         int bid = Math.toIntExact(bankinformation.getId());
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
 
         String bk_code = RegexpUtils.replaceSpecCharacter(bankinformation.getBk_bankcode());
         String code = pushMaxnubmer(bk_code, bankinformation.getId());
@@ -72,9 +73,15 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformation.setBk_bankcode(code);
             bankinformationMapper.insertSelective(bankinformation);
+
+            docBaseDTO.setId(bankinformation.getId());
+            docBaseDTO.setCode(code);
+            docBaseDTO.setName(BillCodeSeq.BANKINFORMATION.getCaller());
+            messageLogService.save(docBaseDTO);
             Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.insertSelective(banksubledger);
         }else {
+            docBaseDTO = this.getBaseDTOById(bid);
             bankinformation.setUpdaterId(BaseContextHolder.getUserId());
             bankinformation.setUpdaterName(BaseContextHolder.getUserName());
             bankinformation.setUpdateTime(new Date());
@@ -83,7 +90,6 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             Double fbeginamount = bankinformation.getBk_beginamount();
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             if (!(fbeginamount.equals(beginamount))){
-                DocBaseDTO docBaseDTO = getBaseDTOById(bid);
                 Map<String, Object> map = new HashMap<String, Object>();
                 map.put("v_id",bid);
                 map.put("v_code", docBaseDTO.getCode());
@@ -101,11 +107,13 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             if (bktion != null){
                 if (id.equals(bankinformation.getId())){
                     bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+                    messageLogService.update(docBaseDTO);
                 }else {
                     throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
                 }
             }else {
                 bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+                messageLogService.update(docBaseDTO);
             }
             Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
@@ -138,7 +146,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
 
     private DocBaseDTO getBaseDTOById(int id) {
         String code = bankinformationMapper.selectByPrimaryKey(id).getBk_bankcode();
-        DocBaseDTO baseDTO = new DocBaseDTO(Long.valueOf(String.valueOf(id)), code, "BankInformation");
+        DocBaseDTO baseDTO = new DocBaseDTO(Long.valueOf(String.valueOf(id)), code, BillCodeSeq.BANKINFORMATION.getCaller());
         return baseDTO;
     }
     @Override

applications/money/money-server/src/main/resources/mapper/AccountDetailsViewMapper.xml

@@ -24,7 +24,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by date desc
+    order by sl_code desc ,date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -10,8 +10,8 @@ Ext.define('saas.view.money.report.OtherIODetail', {
 
     viewName: 'money-report-otheriodetail',
 
-    groupField: 'bankname',
-    groupHeaderTpl: '资金账户: {[values.rows[0].data.bankname]}',
+    groupField: 'bl_bankname',
+    groupHeaderTpl: '资金账户: {[values.rows[0].data.bl_bankname]}',
     listUrl: '/api/money/report/otheriodetail',
     defaultCondition: null,
     reportTitle: '其他收支明细表',