预存费用更改

java110-bean/src/main/java/com/java110/dto/prestoreFee/PrestoreFeeDto.java

@@ -1,7 +1,6 @@
 package com.java110.dto.prestoreFee;
 
 import com.java110.dto.PageDto;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,81 +15,77 @@ import java.util.Date;
 public class PrestoreFeeDto extends PageDto implements Serializable {
 
     private String prestoreFeeAmount;
-    private String prestoreFeeObjType;
-    private String prestoreFeeId;
-    private String remark;
-    private String state;
-    private String communityId;
-    private String prestoreFeeType;
-    private String roomId;
+private String reason;
+private String prestoreFeeObjType;
+private String prestoreFeeId;
+private String remark;
+private String state;
+private String communityId;
+private String prestoreFeeType;
+private String roomId;
+
 
     private Date createTime;
+
     private String statusCd = "0";
 
+
     public String getPrestoreFeeAmount() {
         return prestoreFeeAmount;
     }
-
-    public void setPrestoreFeeAmount(String prestoreFeeAmount) {
+public void setPrestoreFeeAmount(String prestoreFeeAmount) {
         this.prestoreFeeAmount = prestoreFeeAmount;
     }
-
-    public String getPrestoreFeeObjType() {
+public String getReason() {
+        return reason;
+    }
+public void setReason(String reason) {
+        this.reason = reason;
+    }
+public String getPrestoreFeeObjType() {
         return prestoreFeeObjType;
     }
-
-    public void setPrestoreFeeObjType(String prestoreFeeObjType) {
+public void setPrestoreFeeObjType(String prestoreFeeObjType) {
         this.prestoreFeeObjType = prestoreFeeObjType;
     }
-
-    public String getPrestoreFeeId() {
+public String getPrestoreFeeId() {
         return prestoreFeeId;
     }
-
-    public void setPrestoreFeeId(String prestoreFeeId) {
+public void setPrestoreFeeId(String prestoreFeeId) {
         this.prestoreFeeId = prestoreFeeId;
     }
-
-    public String getRemark() {
+public String getRemark() {
         return remark;
     }
-
-    public void setRemark(String remark) {
+public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public String getState() {
+public String getState() {
         return state;
     }
-
-    public void setState(String state) {
+public void setState(String state) {
         this.state = state;
     }
-
-    public String getCommunityId() {
+public String getCommunityId() {
         return communityId;
     }
-
-    public void setCommunityId(String communityId) {
+public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-
-    public String getPrestoreFeeType() {
+public String getPrestoreFeeType() {
         return prestoreFeeType;
     }
-
-    public void setPrestoreFeeType(String prestoreFeeType) {
+public void setPrestoreFeeType(String prestoreFeeType) {
         this.prestoreFeeType = prestoreFeeType;
     }
-
-    public String getRoomId() {
+public String getRoomId() {
         return roomId;
     }
-
-    public void setRoomId(String roomId) {
+public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
 
+
     public Date getCreateTime() {
         return createTime;
     }

java110-bean/src/main/java/com/java110/po/prestoreFee/PrestoreFeePo.java

@@ -6,86 +6,76 @@ import java.util.Date;
 public class PrestoreFeePo implements Serializable {
 
     private String prestoreFeeAmount;
-    private String prestoreFeeObjType;
-    private String prestoreFeeId;
-    private String remark;
-    private String statusCd = "0";
-    private String state;
-    private String communityId;
-    private String prestoreFeeType;
-    private String roomId;
-
-    public String getprestoreFeeAmount() {
+private String reason;
+private String prestoreFeeObjType;
+private String prestoreFeeId;
+private String remark;
+private String statusCd = "0";
+private String state;
+private String communityId;
+private String prestoreFeeType;
+private String roomId;
+public String getPrestoreFeeAmount() {
         return prestoreFeeAmount;
     }
-
-    public void setprestoreFeeAmount(String prestoreFeeAmount) {
+public void setPrestoreFeeAmount(String prestoreFeeAmount) {
         this.prestoreFeeAmount = prestoreFeeAmount;
     }
-
-    public String getPrestoreFeeObjType() {
+public String getReason() {
+        return reason;
+    }
+public void setReason(String reason) {
+        this.reason = reason;
+    }
+public String getPrestoreFeeObjType() {
         return prestoreFeeObjType;
     }
-
-    public void setPrestoreFeeObjType(String prestoreFeeObjType) {
+public void setPrestoreFeeObjType(String prestoreFeeObjType) {
         this.prestoreFeeObjType = prestoreFeeObjType;
     }
-
-    public String getPrestoreFeeId() {
+public String getPrestoreFeeId() {
         return prestoreFeeId;
     }
-
-    public void setPrestoreFeeId(String prestoreFeeId) {
+public void setPrestoreFeeId(String prestoreFeeId) {
         this.prestoreFeeId = prestoreFeeId;
     }
-
-    public String getRemark() {
+public String getRemark() {
         return remark;
     }
-
-    public void setRemark(String remark) {
+public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public String getStatusCd() {
+public String getStatusCd() {
         return statusCd;
     }
-
-    public void setStatusCd(String statusCd) {
+public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-
-    public String getState() {
+public String getState() {
         return state;
     }
-
-    public void setState(String state) {
+public void setState(String state) {
         this.state = state;
     }
-
-    public String getCommunityId() {
+public String getCommunityId() {
         return communityId;
     }
-
-    public void setCommunityId(String communityId) {
+public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-
-    public String getPrestoreFeeType() {
+public String getPrestoreFeeType() {
         return prestoreFeeType;
     }
-
-    public void setPrestoreFeeType(String prestoreFeeType) {
+public void setPrestoreFeeType(String prestoreFeeType) {
         this.prestoreFeeType = prestoreFeeType;
     }
-
-    public String getRoomId() {
+public String getRoomId() {
         return roomId;
     }
-
-    public void setRoomId(String roomId) {
+public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
 
 
+
 }

java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml

@@ -11,9 +11,9 @@
     <!-- 保存预存费用信息 add by wuxw 2018-07-03 -->
     <insert id="savePrestoreFeeInfo" parameterType="Map">
         insert into prestore_fee(
-prestore_fee_amount,prestore_fee_obj_type,prestore_fee_id,remark,state,community_id,prestore_fee_type,room_id
+prestore_fee_amount,reason,prestore_fee_obj_type,prestore_fee_id,remark,state,community_id,prestore_fee_type,room_id
 ) values (
-#{prestoreFeeAmount},#{prestoreFeeObjType},#{prestoreFeeId},#{remark},#{state},#{communityId},#{prestoreFeeType},#{roomId}
+#{prestoreFeeAmount},#{reason},#{prestoreFeeObjType},#{prestoreFeeId},#{remark},#{state},#{communityId},#{prestoreFeeType},#{roomId}
 )
     </insert>
 
@@ -21,12 +21,15 @@ prestore_fee_amount,prestore_fee_obj_type,prestore_fee_id,remark,state,community
 
     <!-- 查询预存费用信息 add by wuxw 2018-07-03 -->
     <select id="getPrestoreFeeInfo" parameterType="Map" resultType="Map">
-        select  t.prestore_fee_amount,t.prestore_fee_amount prestoreFeeAmount,t.prestore_fee_obj_type,t.prestore_fee_obj_type prestoreFeeObjType,t.prestore_fee_id,t.prestore_fee_id prestoreFeeId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.prestore_fee_type,t.prestore_fee_type prestoreFeeType,t.room_id,t.room_id roomId
+        select  t.prestore_fee_amount,t.prestore_fee_amount prestoreFeeAmount,t.reason,t.prestore_fee_obj_type,t.prestore_fee_obj_type prestoreFeeObjType,t.prestore_fee_id,t.prestore_fee_id prestoreFeeId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.prestore_fee_type,t.prestore_fee_type prestoreFeeType,t.room_id,t.room_id roomId 
 from prestore_fee t 
 where 1 =1 
 <if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
    and t.prestore_fee_amount= #{prestoreFeeAmount}
 </if> 
+<if test="reason !=null and reason != ''">
+   and t.reason= #{reason}
+</if> 
 <if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
    and t.prestore_fee_obj_type= #{prestoreFeeObjType}
 </if> 
@@ -70,6 +73,9 @@ order by t.create_time desc
 <if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
 , t.prestore_fee_amount= #{prestoreFeeAmount}
 </if> 
+<if test="reason !=null and reason != ''">
+, t.reason= #{reason}
+</if> 
 <if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
 , t.prestore_fee_obj_type= #{prestoreFeeObjType}
 </if> 
@@ -102,6 +108,9 @@ where 1 =1
 <if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
    and t.prestore_fee_amount= #{prestoreFeeAmount}
 </if> 
+<if test="reason !=null and reason != ''">
+   and t.reason= #{reason}
+</if> 
 <if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
    and t.prestore_fee_obj_type= #{prestoreFeeObjType}
 </if> 

java110-generator/src/main/resources/newBack/template_prestoreFee.json

@@ -15,6 +15,7 @@
     "prestoreFeeAmount": "prestore_fee_amount",
     "remark": "remark",
     "communityId": "community_id",
+    "reason":"reason",
     "state": "state",
     "statusCd": "status_cd"
   },

java110-generator/src/main/resources/web/template_prestoreFee.json

@@ -97,6 +97,18 @@
       "limitErrInfo":"状态格式错误",
       "show": true
     },
+    {
+      "code": "reason",
+      "cnCode":"原因",
+      "desc":"选填，请填写原因",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"maxLength",
+      "limitParam":"100",
+      "limitErrInfo":"原因格式错误",
+      "show": false
+    },
     {
       "code": "remark",
       "cnCode":"备注",

java110-interface/src/main/java/com/java110/intf/fee/IPrestoreFeeInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.intf.fee;
+package com.java110.intf;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.prestoreFee.PrestoreFeeDto;
@@ -24,13 +24,13 @@ public interface IPrestoreFeeInnerServiceSMO {
 
 
     @RequestMapping(value = "/savePrestoreFee", method = RequestMethod.POST)
-    public int savePrestoreFee(@RequestBody PrestoreFeePo prestoreFeePo);
+    public int savePrestoreFee(@RequestBody  PrestoreFeePo prestoreFeePo);
 
     @RequestMapping(value = "/updatePrestoreFee", method = RequestMethod.POST)
     public int updatePrestoreFee(@RequestBody  PrestoreFeePo prestoreFeePo);
 
     @RequestMapping(value = "/deletePrestoreFee", method = RequestMethod.POST)
-    public int deletePrestoreFee(@RequestBody  PrestoreFeePo prestoreFeePo);
+    public int deletePrestoreFee(@RequestBody PrestoreFeePo prestoreFeePo);
 
     /**
      * <p>查询小区楼信息</p>

service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java

@@ -100,20 +100,20 @@ public class PrestoreFeeApi {
      */
     @RequestMapping(value = "/queryPrestoreFee", method = RequestMethod.GET)
     public ResponseEntity<String> queryPrestoreFee(@RequestParam(value = "communityId") String communityId,
-                                                   @RequestParam(value = "prestoreFeeAmount", required = false) String prestoreFeeAmount,
-                                                   @RequestParam(value = "prestoreFeeType", required = false) String prestoreFeeType,
-                                                   @RequestParam(value = "state", required = false) String state,
-                                                   @RequestParam(value = "roomId", required = false) String roomId,
                                                    @RequestParam(value = "page") int page,
+                                                   @RequestParam(value = "state" ,required = false) String state,
+                                                   @RequestParam(value = "roomId" ,required = false) String roomId,
+                                                   @RequestParam(value = "prestoreFeeType" ,required = false) String prestoreFeeType,
+                                                   @RequestParam(value = "prestoreFeeAmount" ,required = false) String prestoreFeeAmount,
                                                    @RequestParam(value = "row") int row) {
         PrestoreFeeDto prestoreFeeDto = new PrestoreFeeDto();
         prestoreFeeDto.setPage(page);
         prestoreFeeDto.setRow(row);
+        prestoreFeeDto.setState(state);
         prestoreFeeDto.setRoomId(roomId);
-        prestoreFeeDto.setCommunityId(communityId);
-        prestoreFeeDto.setPrestoreFeeAmount(prestoreFeeType);
+        prestoreFeeDto.setPrestoreFeeType(prestoreFeeType);
         prestoreFeeDto.setPrestoreFeeAmount(prestoreFeeAmount);
-        prestoreFeeDto.setState(state);
+        prestoreFeeDto.setCommunityId(communityId);
         return getPrestoreFeeBMOImpl.get(prestoreFeeDto);
     }
 }

service-fee/src/main/java/com/java110/fee/bmo/prestoreFee/IDeletePrestoreFeeBMO.java

@@ -1,5 +1,4 @@
 package com.java110.fee.bmo.prestoreFee;
-
 import com.java110.po.prestoreFee.PrestoreFeePo;
 import org.springframework.http.ResponseEntity;
 

service-fee/src/main/java/com/java110/fee/bmo/prestoreFee/impl/DeletePrestoreFeeBMOImpl.java

@@ -1,12 +1,10 @@
 package com.java110.fee.bmo.prestoreFee.impl;
 
-
 import com.alibaba.fastjson.JSONObject;
-
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.fee.bmo.prestoreFee.IDeletePrestoreFeeBMO;
-import com.java110.intf.fee.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.IPrestoreFeeInnerServiceSMO;
 import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
 import com.java110.po.prestoreFee.PrestoreFeePo;
 import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;

service-fee/src/main/java/com/java110/fee/bmo/prestoreFee/impl/GetPrestoreFeeBMOImpl.java

@@ -1,8 +1,12 @@
 package com.java110.fee.bmo.prestoreFee.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.fee.bmo.prestoreFee.IGetPrestoreFeeBMO;
-import com.java110.intf.fee.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
+import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -44,8 +48,6 @@ public class GetPrestoreFeeBMOImpl implements IGetPrestoreFeeBMO {
             prestoreFeeDtos = new ArrayList<>();
         }
 
-
-
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) prestoreFeeDto.getRow()), count, prestoreFeeDtos);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

service-fee/src/main/java/com/java110/fee/bmo/prestoreFee/impl/SavePrestoreFeeBMOImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.fee.bmo.prestoreFee.ISavePrestoreFeeBMO;
-import com.java110.intf.fee.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.IPrestoreFeeInnerServiceSMO;
 import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
 import com.java110.po.prestoreFee.PrestoreFeePo;
 import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;

service-fee/src/main/java/com/java110/fee/bmo/prestoreFee/impl/UpdatePrestoreFeeBMOImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.fee.bmo.prestoreFee.IUpdatePrestoreFeeBMO;
-import com.java110.intf.fee.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.IPrestoreFeeInnerServiceSMO;
 import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
 import com.java110.po.prestoreFee.PrestoreFeePo;
 import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
@@ -12,6 +12,14 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import com.java110.core.context.DataFlowContext;
+import com.java110.dto.prestoreFee.PrestoreFeeDto;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 

service-fee/src/main/java/com/java110/fee/smo/impl/PrestoreFeeInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@ package com.java110.fee.smo.impl;
 
 import com.java110.fee.dao.IPrestoreFeeServiceDao;
 import com.java110.dto.prestoreFee.PrestoreFeeDto;
-import com.java110.intf.fee.IPrestoreFeeInnerServiceSMO;
+import com.java110.intf.IPrestoreFeeInnerServiceSMO;
 import com.java110.po.prestoreFee.PrestoreFeePo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;