开发完成费用公摊功能

java110-bean/src/main/java/com/java110/dto/floorShareFee/FloorShareFeeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.floorShareFee;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,15 +16,16 @@ import java.util.Date;
 public class FloorShareFeeDto extends PageDto implements Serializable {
 
     private String amount;
-private String ownerName;
-private String fsfId;
-private String fsmId;
-private String feeName;
-private String remark;
-private String readingId;
-private String feeId;
-private String roomName;
-private String degrees;
+    private String ownerName;
+    private String ownerNameLike;
+    private String fsfId;
+    private String fsmId;
+    private String feeName;
+    private String remark;
+    private String readingId;
+    private String feeId;
+    private String roomName;
+    private String degrees;
 
 
     private Date createTime;
@@ -34,61 +36,80 @@ private String degrees;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getFsfId() {
+
+    public String getFsfId() {
         return fsfId;
     }
-public void setFsfId(String fsfId) {
+
+    public void setFsfId(String fsfId) {
         this.fsfId = fsfId;
     }
-public String getFsmId() {
+
+    public String getFsmId() {
         return fsmId;
     }
-public void setFsmId(String fsmId) {
+
+    public void setFsmId(String fsmId) {
         this.fsmId = fsmId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getReadingId() {
+
+    public String getReadingId() {
         return readingId;
     }
-public void setReadingId(String readingId) {
+
+    public void setReadingId(String readingId) {
         this.readingId = readingId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getRoomName() {
+
+    public String getRoomName() {
         return roomName;
     }
-public void setRoomName(String roomName) {
+
+    public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
-public String getDegrees() {
+
+    public String getDegrees() {
         return degrees;
     }
-public void setDegrees(String degrees) {
+
+    public void setDegrees(String degrees) {
         this.degrees = degrees;
     }
 
@@ -108,4 +129,12 @@ public void setDegrees(String degrees) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getOwnerNameLike() {
+        return ownerNameLike;
+    }
+
+    public void setOwnerNameLike(String ownerNameLike) {
+        this.ownerNameLike = ownerNameLike;
+    }
 }

java110-bean/src/main/java/com/java110/dto/floorShareReading/FloorShareReadingDto.java

@@ -29,9 +29,11 @@ public class FloorShareReadingDto extends PageDto implements Serializable {
     private String auditStaffName;
     private String preReadingTime;
     private String state;
-    private String statsMsg;
+    private String stateMsg;
     private String shareMsg;
     private String communityId;
+    private String startTime;
+    private String endTime;
 
 
     private Date createTime;
@@ -152,12 +154,12 @@ public class FloorShareReadingDto extends PageDto implements Serializable {
         this.statusCd = statusCd;
     }
 
-    public String getStatsMsg() {
-        return statsMsg;
+    public String getStateMsg() {
+        return stateMsg;
     }
 
-    public void setStatsMsg(String statsMsg) {
-        this.statsMsg = statsMsg;
+    public void setStateMsg(String stateMsg) {
+        this.stateMsg = stateMsg;
     }
 
     public String getShareMsg() {
@@ -167,4 +169,20 @@ public class FloorShareReadingDto extends PageDto implements Serializable {
     public void setShareMsg(String shareMsg) {
         this.shareMsg = shareMsg;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

java110-bean/src/main/java/com/java110/po/floorShareReading/FloorShareReadingPo.java

@@ -41,7 +41,7 @@ public class FloorShareReadingPo implements Serializable {
     private String preReadingTime;
     private String state;
 
-    private String statsMsg;
+    private String stateMsg;
     private String shareMsg;
     private String communityId;
 
@@ -149,12 +149,12 @@ public class FloorShareReadingPo implements Serializable {
         this.communityId = communityId;
     }
 
-    public String getStatsMsg() {
-        return statsMsg;
+    public String getStateMsg() {
+        return stateMsg;
     }
 
-    public void setStatsMsg(String statsMsg) {
-        this.statsMsg = statsMsg;
+    public void setStateMsg(String stateMsg) {
+        this.stateMsg = stateMsg;
     }
 
     public String getShareMsg() {

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

@@ -38,6 +38,9 @@
         <if test="ownerName !=null and ownerName != ''">
             and t.owner_name= #{ownerName}
         </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and t.owner_name like concat('%',#{ownerNameLike},'%')
+        </if>
         <if test="fsfId !=null and fsfId != ''">
             and t.fsf_id= #{fsfId}
         </if>
@@ -124,6 +127,9 @@
         <if test="ownerName !=null and ownerName != ''">
             and t.owner_name= #{ownerName}
         </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and t.owner_name like concat('%',#{ownerNameLike},'%')
+        </if>
         <if test="fsfId !=null and fsfId != ''">
             and t.fsf_id= #{fsfId}
         </if>

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

@@ -64,6 +64,12 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -168,6 +174,12 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
 
 
     </select>

service-fee/src/main/java/com/java110/fee/cmd/meter/AuditFloorShareReadingCmd.java

@@ -24,9 +24,11 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.data.DatabusDataDto;
 import com.java110.dto.floorShareReading.FloorShareReadingDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.fee.IFloorShareMeterV1InnerServiceSMO;
 import com.java110.intf.fee.IFloorShareReadingV1InnerServiceSMO;
 import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.floorShareMeter.FloorShareMeterPo;
 import com.java110.po.floorShareReading.FloorShareReadingPo;
 import com.java110.utils.exception.CmdException;
@@ -66,6 +68,9 @@ public class AuditFloorShareReadingCmd extends Cmd {
     @Autowired
     private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "readingId", "readingId不能为空");
@@ -79,6 +84,10 @@ public class AuditFloorShareReadingCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        Assert.listOnlyOne(userDtos, "用户不存在");
 
         FloorShareReadingDto floorShareReadingDto = new FloorShareReadingDto();
         floorShareReadingDto.setReadingId(reqJson.getString("readingId"));
@@ -93,7 +102,11 @@ public class AuditFloorShareReadingCmd extends Cmd {
         FloorShareReadingPo floorShareReadingPo = new FloorShareReadingPo();
         floorShareReadingPo.setReadingId(reqJson.getString("readingId"));
         floorShareReadingPo.setState(state);
-        floorShareReadingPo.setStatsMsg("审核意见：" + reqJson.getString("auditRemark"));
+        floorShareReadingPo.setAuditStaffName(userDtos.get(0).getName());
+        floorShareReadingPo.setStateMsg("审核意见：" + reqJson.getString("auditRemark"));
+        if (FloorShareReadingDto.STATE_C.equals(state)) {
+            floorShareReadingPo.setShareMsg("开始公摊");
+        }
         int flag = floorShareReadingV1InnerServiceSMOImpl.updateFloorShareReading(floorShareReadingPo);
 
         if (flag < 1) {

service-fee/src/main/java/com/java110/fee/cmd/meter/DeleteFloorShareReadingCmd.java

@@ -21,16 +21,22 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.floorShareReading.FloorShareReadingDto;
+import com.java110.intf.fee.IFloorShareMeterV1InnerServiceSMO;
 import com.java110.intf.fee.IFloorShareReadingV1InnerServiceSMO;
+import com.java110.po.floorShareMeter.FloorShareMeterPo;
 import com.java110.po.floorShareReading.FloorShareReadingPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：删除
  * 服务编码：floorShareReading.deleteFloorShareReading
@@ -48,6 +54,9 @@ public class DeleteFloorShareReadingCmd extends Cmd {
     @Autowired
     private IFloorShareReadingV1InnerServiceSMO floorShareReadingV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IFloorShareMeterV1InnerServiceSMO floorShareMeterV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "readingId", "readingId不能为空");
@@ -59,6 +68,14 @@ public class DeleteFloorShareReadingCmd extends Cmd {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        FloorShareReadingDto floorShareReadingDto = new FloorShareReadingDto();
+        floorShareReadingDto.setReadingId(reqJson.getString("readingId"));
+        floorShareReadingDto.setCommunityId(reqJson.getString("communityId"));
+        List<FloorShareReadingDto> floorShareReadingDtos
+                = floorShareReadingV1InnerServiceSMOImpl.queryFloorShareReadings(floorShareReadingDto);
+        if (ListUtil.isNull(floorShareReadingDtos)) {
+            throw new CmdException("记录不存在");
+        }
 
         FloorShareReadingPo floorShareReadingPo = BeanConvertUtil.covertBean(reqJson, FloorShareReadingPo.class);
         int flag = floorShareReadingV1InnerServiceSMOImpl.deleteFloorShareReading(floorShareReadingPo);
@@ -67,6 +84,13 @@ public class DeleteFloorShareReadingCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        FloorShareMeterPo floorShareMeterPo = new FloorShareMeterPo();
+        floorShareMeterPo.setFsmId(floorShareReadingDtos.get(0).getFsmId());
+        floorShareMeterPo.setCurReadingTime(floorShareReadingDtos.get(0).getPreReadingTime());
+        floorShareMeterPo.setCurDegree(floorShareReadingDtos.get(0).getPreDegrees());
+        floorShareMeterPo.setCommunityId(floorShareReadingDtos.get(0).getCommunityId());
+        floorShareMeterV1InnerServiceSMOImpl.updateFloorShareMeter(floorShareMeterPo);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-fee/src/main/java/com/java110/fee/cmd/meter/SaveFloorShareReadingCmd.java

@@ -34,6 +34,7 @@ import com.java110.po.floorShareReading.FloorShareReadingPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,8 @@ public class SaveFloorShareReadingCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         super.validateProperty(cmdDataFlowContext);
 
+
+
     }
 
     @Override

service-job/src/main/java/com/java110/job/adapt/fee/FloorShareReadingAdapt.java

@@ -174,7 +174,7 @@ public class FloorShareReadingAdapt extends DatabusAdaptImpl {
         List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
 
         Assert.listOnlyOne(userDtos, "用户不存在");
-        payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
+        payFeeBatchPo.setCreateUserName(userDtos.get(0).getName());
         payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
         payFeeBatchPo.setMsg("正常");
         int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);
@@ -225,6 +225,8 @@ public class FloorShareReadingAdapt extends DatabusAdaptImpl {
 
         floorShareFeeV1InnerServiceSMOImpl.saveFloorShareFees(floorShareFeePos);
 
+        modifyShareMsg(floorShareReadingDto,"公摊完成");
+
     }
 
     private double computeRoomDegree(List<RoomDto> roomDtos, RoomDto curRoomDto, FloorShareMeterDto floorShareMeterDto, FloorShareReadingDto floorShareReadingDto) {
@@ -367,7 +369,7 @@ public class FloorShareReadingAdapt extends DatabusAdaptImpl {
     private void modifyShareMsg(FloorShareReadingDto floorShareReadingDto, String shareMsg) {
         FloorShareReadingPo floorShareReadingPo = new FloorShareReadingPo();
         floorShareReadingPo.setReadingId(floorShareReadingDto.getReadingId());
-        floorShareReadingPo.setStatsMsg("公摊进度：" + shareMsg);
+        floorShareReadingPo.setShareMsg("公摊进度：" + shareMsg);
         floorShareReadingV1InnerServiceSMOImpl.updateFloorShareReading(floorShareReadingPo);
     }