From 0a38562076c5a68b8cfb6ffd634ede1164b1fbf0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 03 七月 2021 09:57:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java | 4 ++
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml | 4 +-
service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java | 33 +++++++++++++++-
java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java | 9 ++++
java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java | 9 ++++
java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java | 8 +++
java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java | 8 +++
java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml | 23 ++++++++---
java110-db/src/main/resources/mapper/acct/AccountBondObjDetailServiceDaoImplMapper.xml | 15 +++++--
9 files changed, 94 insertions(+), 19 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java b/java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java
index 3d98316..10e90d5 100644
--- a/java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java
@@ -17,6 +17,7 @@
private String bondId;
private String bobjId;
private String objId;
+private String objName;
private String bondType;
private String receivableAmount;
private String remark;
@@ -108,4 +109,12 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public String getObjName() {
+ return objName;
+ }
+
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java b/java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java
index 58a2bbc..00ff484 100644
--- a/java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java
@@ -16,6 +16,7 @@
private String bobjId;
private String objId;
+private String objName;
private String bondType;
private String detailId;
private String receivableAmount;
@@ -108,4 +109,12 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public String getObjName() {
+ return objName;
+ }
+
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java b/java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java
index 22bfc68..c12155a 100644
--- a/java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java
+++ b/java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java
@@ -8,6 +8,7 @@
private String bondId;
private String bobjId;
private String objId;
+private String objName;
private String bondType;
private String receivableAmount;
private String remark;
@@ -83,6 +84,11 @@
this.endTime = endTime;
}
+ public String getObjName() {
+ return objName;
+ }
-
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java b/java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java
index 00572a1..6f98fe4 100644
--- a/java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java
+++ b/java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java
@@ -7,6 +7,7 @@
private String bobjId;
private String objId;
+private String objName;
private String bondType;
private String detailId;
private String receivableAmount;
@@ -83,6 +84,11 @@
this.endTime = endTime;
}
+ public String getObjName() {
+ return objName;
+ }
-
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
}
diff --git a/java110-db/src/main/resources/mapper/acct/AccountBondObjDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/AccountBondObjDetailServiceDaoImplMapper.xml
index 18deed3..56d084c 100644
--- a/java110-db/src/main/resources/mapper/acct/AccountBondObjDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/AccountBondObjDetailServiceDaoImplMapper.xml
@@ -11,9 +11,9 @@
<!-- 淇濆瓨淇濊瘉閲戞槑缁嗕俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveAccountBondObjDetailInfo" parameterType="Map">
insert into account_bond_obj_detail(
-bobj_id,obj_id,bond_type,detail_id,receivable_amount,remark,start_time,received_amount,state,end_time
+bobj_id,obj_id,bond_type,detail_id,receivable_amount,remark,start_time,received_amount,state,end_time,obj_name
) values (
-#{bobjId},#{objId},#{bondType},#{detailId},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime}
+#{bobjId},#{objId},#{bondType},#{detailId},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{objName}
)
</insert>
@@ -21,7 +21,9 @@
<!-- 鏌ヨ淇濊瘉閲戞槑缁嗕俊鎭� add by wuxw 2018-07-03 -->
<select id="getAccountBondObjDetailInfo" parameterType="Map" resultType="Map">
- select t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,t.obj_id objId,t.bond_type,t.bond_type bondType,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.state,t.end_time,t.end_time endTime
+ select t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,t.obj_id objId,t.bond_type,t.bond_type bondType,
+ t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.start_time,t.start_time startTime,
+ t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.state,t.end_time,t.end_time endTime,t.obj_name objName
from account_bond_obj_detail t
where 1 =1
<if test="bobjId !=null and bobjId != ''">
@@ -84,8 +86,11 @@
</if>
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
-</if>
-<if test="bondType !=null and bondType != ''">
+</if>
+ <if test="objName !=null and objName != ''">
+ , t.obj_name= #{objName}
+ </if>
+ <if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if>
<if test="receivableAmount !=null and receivableAmount != ''">
diff --git a/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
index aafa99f..d292ed5 100644
--- a/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
@@ -11,9 +11,9 @@
<!-- 淇濆瓨淇濊瘉閲戝璞′俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveAccountBondObjInfo" parameterType="Map">
insert into account_bond_obj(
-bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_amount,state,end_time
+bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_amount,state,end_time,obj_name
) values (
-#{bondId},#{bobjId},#{objId},#{bondType},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime}
+#{bondId},#{bobjId},#{objId},#{bondType},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{objName}
)
</insert>
@@ -21,7 +21,10 @@
<!-- 鏌ヨ淇濊瘉閲戝璞′俊鎭� add by wuxw 2018-07-03 -->
<select id="getAccountBondObjInfo" parameterType="Map" resultType="Map">
- select t.bond_id,t.bond_id bondId,t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,t.obj_id objId,t.bond_type,t.bond_type bondType,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.state,t.end_time,t.end_time endTime
+ select t.bond_id,t.bond_id bondId,t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,
+ t.obj_id objId,t.bond_type,t.bond_type bondType,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,
+ t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
+ t.state,t.end_time,t.end_time endTime,t.obj_name objName
from account_bond_obj t
where 1 =1
<if test="bondId !=null and bondId != ''">
@@ -35,8 +38,11 @@
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
-</if>
-<if test="bondType !=null and bondType != ''">
+</if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="bondType !=null and bondType != ''">
and t.bond_type= #{bondType}
</if>
<if test="receivableAmount !=null and receivableAmount != ''">
@@ -84,8 +90,11 @@
</if>
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
-</if>
-<if test="bondType !=null and bondType != ''">
+</if>
+ <if test="objName !=null and objName != ''">
+ , t.obj_name= #{objName}
+ </if>
+ <if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if>
<if test="receivableAmount !=null and receivableAmount != ''">
diff --git a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
index e58388f..d62f1f9 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
@@ -75,7 +75,7 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -289,7 +289,7 @@
#{item}
</foreach>
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java
index 8e19641..58ac8af 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java
@@ -103,6 +103,8 @@
@RequestMapping(value = "/queryAccountBondObjDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryAccountBondObjDetail(@RequestParam(value = "detailId" , required = false) String detailId,
@RequestParam(value = "bobjId" , required = false) String bobjId,
+ @RequestParam(value = "state" , required = false) String state,
+ @RequestParam(value = "objId" , required = false) String objId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
AccountBondObjDetailDto accountBondObjDetailDto = new AccountBondObjDetailDto();
@@ -110,6 +112,8 @@
accountBondObjDetailDto.setRow(row);
accountBondObjDetailDto.setDetailId( detailId );
accountBondObjDetailDto.setBobjId( bobjId );
+ accountBondObjDetailDto.setState( state );
+ accountBondObjDetailDto.setObjId( objId );
return getAccountBondObjDetailBMOImpl.get(accountBondObjDetailDto);
}
}
diff --git a/service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java b/service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java
index c4bfce2..b59e8ee 100755
--- a/service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java
@@ -5,6 +5,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.*;
+import com.java110.dto.logSystemError.LogSystemErrorDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.task.TaskDto;
@@ -16,9 +17,12 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.po.logSystemError.LogSystemErrorPo;
+import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.TaskTemplateException;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -73,6 +77,9 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ @Autowired
+ private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
+
@Override
protected void process(TaskDto taskDto) throws Exception {
@@ -81,7 +88,17 @@
List<CommunityDto> communityDtos = getAllCommunity();
for (CommunityDto communityDto : communityDtos) {
- GenerateBill(taskDto, communityDto);
+ try {
+ GenerateBill(taskDto, communityDto);
+ }catch (Throwable e){
+
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
+ logger.error("璐圭敤鍑鸿处澶辫触" + communityDto.getCommunityId(), e);
+ }
}
}
@@ -106,7 +123,12 @@
for (FeeConfigDto tmpFeeConfigDto : feeConfigDtos) {
try {
GenerateBillByFeeConfig(taskDto, tmpFeeConfigDto);
- } catch (Exception e) {
+ } catch (Throwable e) {
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("璐圭敤鍑鸿处澶辫触" + tmpFeeConfigDto.getConfigId(), e);
}
}
@@ -169,7 +191,12 @@
for (FeeDto tmpFeeDto : feeDtos) {
try {
generateFee(startTime, tmpFeeDto, billDto, feeConfigDto);
- } catch (Exception e) {
+ } catch (Throwable e) {
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("鐢熸垚璐圭敤澶辫触", e);
}
}
--
Gitblit v1.8.0