优化代码

java110-bean/src/main/java/com/java110/po/junkRequirement/JunkRequirementPo.java

@@ -23,6 +23,7 @@ public class JunkRequirementPo implements Serializable {
     private String state;
 
     private String communityId;
+    private String statusCd = "0";
 
     public String getJunkRequirementId() {
         return junkRequirementId;
@@ -103,4 +104,12 @@ public class JunkRequirementPo implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-db/src/main/resources/mapper/community/RepairPoolNewV1ServiceDaoImplMapper.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="repairPoolNewV1ServiceDaoImpl">
+
+
+    <!-- 保存费用明细信息 add by wuxw 2018-07-03 -->
+    <insert id="saveRepairPoolNewInfo" parameterType="Map">
+        insert into r_repair_pool(
+        repair_type,repair_obj_type,repair_id,pay_type,repair_name,repair_obj_id,appointment_time,repair_fee,context,tel,repair_channel,repair_materials,state,community_id,maintenance_type,repair_obj_name
+        ) values (
+        #{repairType},#{repairObjType},#{repairId},#{payType},#{repairName},#{repairObjId},#{appointmentTime},#{repairFee},#{context},#{tel},#{repairChannel},#{repairMaterials},#{state},#{communityId},#{maintenanceType},#{repairObjName}
+        )
+    </insert>
+
+
+    <!-- 查询费用明细信息 add by wuxw 2018-07-03 -->
+    <select id="getRepairPoolNewInfo" parameterType="Map" resultType="Map">
+        select t.repair_type,t.repair_type repairType,t.repair_obj_type,t.repair_obj_type
+        repairObjType,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,t.pay_type,t.pay_type
+        payType,t.repair_name,t.repair_name repairName,t.repair_obj_id,t.repair_obj_id
+        repairObjId,t.appointment_time,t.appointment_time appointmentTime,t.repair_fee,t.repair_fee
+        repairFee,t.context,t.tel,t.repair_channel,t.repair_channel repairChannel,t.repair_materials,t.repair_materials
+        repairMaterials,t.state,t.community_id,t.community_id communityId,t.maintenance_type,t.maintenance_type
+        maintenanceType,t.repair_obj_name,t.repair_obj_name repairObjName
+        from r_repair_pool t
+        where 1 =1
+        <if test="repairType !=null and repairType != ''">
+            and t.repair_type= #{repairType}
+        </if>
+        <if test="repairObjType !=null and repairObjType != ''">
+            and t.repair_obj_type= #{repairObjType}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="payType !=null and payType != ''">
+            and t.pay_type= #{payType}
+        </if>
+        <if test="repairName !=null and repairName != ''">
+            and t.repair_name= #{repairName}
+        </if>
+        <if test="repairObjId !=null and repairObjId != ''">
+            and t.repair_obj_id= #{repairObjId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            and t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="repairFee !=null and repairFee != ''">
+            and t.repair_fee= #{repairFee}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="repairChannel !=null and repairChannel != ''">
+            and t.repair_channel= #{repairChannel}
+        </if>
+        <if test="repairMaterials !=null and repairMaterials != ''">
+            and t.repair_materials= #{repairMaterials}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="maintenanceType !=null and maintenanceType != ''">
+            and t.maintenance_type= #{maintenanceType}
+        </if>
+        <if test="repairObjName !=null and repairObjName != ''">
+            and t.repair_obj_name= #{repairObjName}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改费用明细信息 add by wuxw 2018-07-03 -->
+    <update id="updateRepairPoolNewInfo" parameterType="Map">
+        update r_repair_pool t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="repairType !=null and repairType != ''">
+            , t.repair_type= #{repairType}
+        </if>
+        <if test="repairObjType !=null and repairObjType != ''">
+            , t.repair_obj_type= #{repairObjType}
+        </if>
+        <if test="payType !=null and payType != ''">
+            , t.pay_type= #{payType}
+        </if>
+        <if test="repairName !=null and repairName != ''">
+            , t.repair_name= #{repairName}
+        </if>
+        <if test="repairObjId !=null and repairObjId != ''">
+            , t.repair_obj_id= #{repairObjId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            , t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="repairFee !=null and repairFee != ''">
+            , t.repair_fee= #{repairFee}
+        </if>
+        <if test="context !=null and context != ''">
+            , t.context= #{context}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="repairChannel !=null and repairChannel != ''">
+            , t.repair_channel= #{repairChannel}
+        </if>
+        <if test="repairMaterials !=null and repairMaterials != ''">
+            , t.repair_materials= #{repairMaterials}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="maintenanceType !=null and maintenanceType != ''">
+            , t.maintenance_type= #{maintenanceType}
+        </if>
+        <if test="repairObjName !=null and repairObjName != ''">
+            , t.repair_obj_name= #{repairObjName}
+        </if>
+        where 1=1
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
+
+    </update>
+
+    <!-- 查询费用明细数量 add by wuxw 2018-07-03 -->
+    <select id="queryRepairPoolNewsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from r_repair_pool t
+        where 1 =1
+        <if test="repairType !=null and repairType != ''">
+            and t.repair_type= #{repairType}
+        </if>
+        <if test="repairObjType !=null and repairObjType != ''">
+            and t.repair_obj_type= #{repairObjType}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="payType !=null and payType != ''">
+            and t.pay_type= #{payType}
+        </if>
+        <if test="repairName !=null and repairName != ''">
+            and t.repair_name= #{repairName}
+        </if>
+        <if test="repairObjId !=null and repairObjId != ''">
+            and t.repair_obj_id= #{repairObjId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            and t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="repairFee !=null and repairFee != ''">
+            and t.repair_fee= #{repairFee}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="repairChannel !=null and repairChannel != ''">
+            and t.repair_channel= #{repairChannel}
+        </if>
+        <if test="repairMaterials !=null and repairMaterials != ''">
+            and t.repair_materials= #{repairMaterials}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="maintenanceType !=null and maintenanceType != ''">
+            and t.maintenance_type= #{maintenanceType}
+        </if>
+        <if test="repairObjName !=null and repairObjName != ''">
+            and t.repair_obj_name= #{repairObjName}
+        </if>
+
+
+    </select>
+
+</mapper>

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.intf.fee;
+package com.java110.intf.community;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.po.owner.RepairPoolPo;
@@ -32,9 +32,9 @@ import java.util.List;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/repairPoolNewV1Api")
-public interface IRepairPoolNewV1InnerServiceSMO {
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/repairPoolV1Api")
+public interface IRepairPoolV1InnerServiceSMO {
 
 
     @RequestMapping(value = "/saveRepairPoolNew", method = RequestMethod.POST)

service-fee/src/main/java/com/java110/fee/dao/IRepairPoolNewV1ServiceDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.fee.dao;
+package com.java110.community.dao;
 
 
 import com.java110.utils.exception.DAOException;

service-fee/src/main/java/com/java110/fee/dao/impl/RepairPoolNewV1ServiceDaoImpl.java

@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.fee.dao.impl;
+package com.java110.community.dao.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.fee.dao.IRepairPoolNewV1ServiceDao;
+import com.java110.community.dao.IRepairPoolNewV1ServiceDao;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

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

@@ -13,23 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.fee.smo.impl;
+package com.java110.community.smo.impl;
 
 
-import com.java110.fee.dao.IRepairPoolNewV1ServiceDao;
-import com.java110.intf.fee.IRepairPoolNewV1InnerServiceSMO;
+import com.java110.community.dao.IRepairPoolNewV1ServiceDao;
+import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.po.owner.RepairPoolPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
-import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
  * add by 吴学文 at 2021-12-06 22:28:18 mail: 928255095@qq.com
@@ -39,7 +34,7 @@ import java.util.List;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @RestController
-public class RepairPoolNewV1InnerServiceSMOImpl extends BaseServiceSMO implements IRepairPoolNewV1InnerServiceSMO {
+public class RepairPoolV1InnerServiceSMOImpl extends BaseServiceSMO implements IRepairPoolV1InnerServiceSMO {
 
     @Autowired
     private IRepairPoolNewV1ServiceDao repairPoolNewV1ServiceDaoImpl;

service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java

@@ -18,10 +18,7 @@ import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.*;
 import com.java110.intf.fee.*;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.po.car.OwnerCarPo;
@@ -93,7 +90,7 @@ public class PayBatchFeeCmd extends Cmd {
     private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
 
     @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+    private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
     @Autowired
     private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
 

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -24,10 +24,7 @@ import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
 import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.*;
 import com.java110.intf.fee.*;
 import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
@@ -41,7 +38,6 @@ import com.java110.po.owner.RepairPoolPo;
 import com.java110.po.owner.RepairUserPo;
 import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
 import com.java110.utils.constant.FeeFlagTypeConstant;
-import com.java110.utils.constant.FeeStateConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.exception.ListenerExecuteException;
@@ -113,7 +109,7 @@ public class PayFeeCmd extends Cmd {
     private IPayFeeDetailDiscountNewV1InnerServiceSMO payFeeDetailDiscountNewV1InnerServiceSMOImpl;
 
     @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+    private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
 
     @Autowired
     private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java

@@ -24,6 +24,7 @@ import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
 import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.*;
@@ -91,7 +92,7 @@ public class PayFeeConfirmCmd extends Cmd {
     @Autowired
     private IPayFeeDetailDiscountNewV1InnerServiceSMO payFeeDetailDiscountNewV1InnerServiceSMOImpl;
     @Autowired
-    private IRepairPoolNewV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
+    private IRepairPoolV1InnerServiceSMO repairPoolNewV1InnerServiceSMOImpl;
     @Autowired
     private IRepairUserNewV1InnerServiceSMO repairUserNewV1InnerServiceSMOImpl;
     @Autowired