Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java

@@ -17,6 +17,7 @@ public class AccountBondObjDto extends PageDto implements Serializable {
     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 setEndTime(String endTime) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java

@@ -16,6 +16,7 @@ public class AccountBondObjDetailDto extends PageDto implements Serializable {
 
     private String bobjId;
 private String objId;
+private String objName;
 private String bondType;
 private String detailId;
 private String receivableAmount;
@@ -108,4 +109,12 @@ public void setEndTime(String endTime) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
 }

java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java

@@ -8,6 +8,7 @@ public class AccountBondObjPo implements Serializable {
     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 @@ public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
 
+    public String getObjName() {
+        return objName;
+    }
 
-
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
 }

java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java

@@ -7,6 +7,7 @@ public class AccountBondObjDetailPo implements Serializable {
 
     private String bobjId;
 private String objId;
+private String objName;
 private String bondType;
 private String detailId;
 private String receivableAmount;
@@ -83,6 +84,11 @@ public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
 
+    public String getObjName() {
+        return objName;
+    }
 
-
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
 }

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 @@ bobj_id,obj_id,bond_type,detail_id,receivable_amount,remark,start_time,received_
 
     <!-- 查询保证金明细信息 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 @@ order by t.create_time desc
 </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 != ''">

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 @@ bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_am
 
     <!-- 查询保证金对象信息 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 @@ where 1 =1
 </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 @@ order by t.create_time desc
 </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 != ''">

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>

service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java

@@ -103,6 +103,8 @@ public class AccountBondObjDetailApi {
     @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 @@ public class AccountBondObjDetailApi {
         accountBondObjDetailDto.setRow(row);
         accountBondObjDetailDto.setDetailId( detailId );
         accountBondObjDetailDto.setBobjId( bobjId );
+        accountBondObjDetailDto.setState( state );
+        accountBondObjDetailDto.setObjId( objId );
         return getAccountBondObjDetailBMOImpl.get(accountBondObjDetailDto);
     }
 }

service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java

@@ -5,6 +5,7 @@ import com.java110.core.smo.IComputeFeeSMO;
 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.fee.IFeeInnerServiceSMO;
 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 @@ public class GenerateBillProTemplate extends TaskSystemQuartz {
     @Autowired
     private IComputeFeeSMO computeFeeSMOImpl;
 
+    @Autowired
+    private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
+
 
     @Override
     protected void process(TaskDto taskDto) throws Exception {
@@ -81,7 +88,17 @@ public class GenerateBillProTemplate extends TaskSystemQuartz {
         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 @@ public class GenerateBillProTemplate extends TaskSystemQuartz {
         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 @@ public class GenerateBillProTemplate extends TaskSystemQuartz {
         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);
             }
         }