wuxw лет назад: 5
Родитель
Сommit
32ba1d3ee7
13 измененных файлов с 164 добавлено и 212 удалено
  1. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  2. 100 104
      java110-db/src/main/resources/mapper/store/ContractChangePlanRoomServiceDaoImplMapper.xml
  3. 4 3
      java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanRoomInnerServiceSMO.java
  4. 25 20
      service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java
  5. 2 1
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IDeleteContractChangePlanRoomBMO.java
  6. 2 1
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IGetContractChangePlanRoomBMO.java
  7. 2 1
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/ISaveContractChangePlanRoomBMO.java
  8. 2 1
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IUpdateContractChangePlanRoomBMO.java
  9. 5 19
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/DeleteContractChangePlanRoomBMOImpl.java
  10. 8 21
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/GetContractChangePlanRoomBMOImpl.java
  11. 5 18
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/SaveContractChangePlanRoomBMOImpl.java
  12. 5 21
      service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/UpdateContractChangePlanRoomBMOImpl.java
  13. 3 2
      service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanRoomInnerServiceSMOImpl.java

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -197,6 +197,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_crId = "28";
     public static final String CODE_PREFIX_partyaId = "28";
     public static final String CODE_PREFIX_applyId = "29";
+    public static final String CODE_PREFIX_prId = "30";
 
 
     /**

+ 100 - 104
java110-db/src/main/resources/mapper/store/ContractChangePlanRoomServiceDaoImplMapper.xml

@@ -5,129 +5,125 @@
 <mapper namespace="contractChangePlanRoomServiceDaoImpl">
 
 
-
-
-
     <!-- 保存合同房屋变更信息 add by wuxw 2018-07-03 -->
     <insert id="saveContractChangePlanRoomInfo" parameterType="Map">
         insert into contract_change_plan_room(
-operate,owner_name,contract_id,pr_id,plan_id,owner_id,store_id,room_id,room_name
-) values (
-#{operate},#{ownerName},#{contractId},#{prId},#{planId},#{ownerId},#{storeId},#{roomId},#{roomName}
-)
+        operate,owner_name,contract_id,pr_id,plan_id,owner_id,store_id,room_id,room_name
+        ) values (
+        #{operate},#{ownerName},#{contractId},#{prId},#{planId},#{ownerId},#{storeId},#{roomId},#{roomName}
+        )
     </insert>
 
 
-
     <!-- 查询合同房屋变更信息 add by wuxw 2018-07-03 -->
     <select id="getContractChangePlanRoomInfo" parameterType="Map" resultType="Map">
-        select  t.owner_name,t.owner_name ownerName,t.contract_id,t.contract_id contractId,t.pr_id,t.pr_id prId,t.plan_id,t.plan_id planId,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName 
-from contract_change_plan_room t 
-where 1 =1 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="contractId !=null and contractId != ''">
-   and t.contract_id= #{contractId}
-</if> 
-<if test="prId !=null and prId != ''">
-   and t.pr_id= #{prId}
-</if> 
-<if test="planId !=null and planId != ''">
-   and t.plan_id= #{planId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-   and t.room_name= #{roomName}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.owner_name,t.owner_name ownerName,t.contract_id,t.contract_id contractId,t.pr_id,t.pr_id prId,t.plan_id,t.plan_id planId,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id
+        ownerId,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName
+        from contract_change_plan_room t
+        where 1 =1
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="contractId !=null and contractId != ''">
+            and t.contract_id= #{contractId}
+        </if>
+        <if test="prId !=null and prId != ''">
+            and t.pr_id= #{prId}
+        </if>
+        <if test="planId !=null and planId != ''">
+            and t.plan_id= #{planId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            and t.room_name= #{roomName}
+        </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="updateContractChangePlanRoomInfo" parameterType="Map">
-        update  contract_change_plan_room t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="contractId !=null and contractId != ''">
-, t.contract_id= #{contractId}
-</if> 
-<if test="planId !=null and planId != ''">
-, t.plan_id= #{planId}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-, t.room_name= #{roomName}
-</if> 
- where 1=1 <if test="prId !=null and prId != ''">
-and t.pr_id= #{prId}
-</if> 
+        update contract_change_plan_room t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="contractId !=null and contractId != ''">
+            , t.contract_id= #{contractId}
+        </if>
+        <if test="planId !=null and planId != ''">
+            , t.plan_id= #{planId}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            , t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            , t.room_name= #{roomName}
+        </if>
+        where 1=1
+        <if test="prId !=null and prId != ''">
+            and t.pr_id= #{prId}
+        </if>
 
     </update>
 
     <!-- 查询合同房屋变更数量 add by wuxw 2018-07-03 -->
-     <select id="queryContractChangePlanRoomsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from contract_change_plan_room t 
-where 1 =1 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="contractId !=null and contractId != ''">
-   and t.contract_id= #{contractId}
-</if> 
-<if test="prId !=null and prId != ''">
-   and t.pr_id= #{prId}
-</if> 
-<if test="planId !=null and planId != ''">
-   and t.plan_id= #{planId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-   and t.room_name= #{roomName}
-</if> 
+    <select id="queryContractChangePlanRoomsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from contract_change_plan_room t
+        where 1 =1
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="contractId !=null and contractId != ''">
+            and t.contract_id= #{contractId}
+        </if>
+        <if test="prId !=null and prId != ''">
+            and t.pr_id= #{prId}
+        </if>
+        <if test="planId !=null and planId != ''">
+            and t.plan_id= #{planId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            and t.room_name= #{roomName}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

+ 4 - 3
java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanRoomInnerServiceSMO.java

@@ -1,7 +1,8 @@
-package com.java110.intf;
+package com.java110.intf.store;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,13 +18,13 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/contractChangePlanRoomApi")
 public interface IContractChangePlanRoomInnerServiceSMO {
 
 
     @RequestMapping(value = "/saveContractChangePlanRoom", method = RequestMethod.POST)
-    public int saveContractChangePlanRoom(@RequestBody  ContractChangePlanRoomPo contractChangePlanRoomPo);
+    public int saveContractChangePlanRoom(@RequestBody ContractChangePlanRoomPo contractChangePlanRoomPo);
 
     @RequestMapping(value = "/updateContractChangePlanRoom", method = RequestMethod.POST)
     public int updateContractChangePlanRoom(@RequestBody  ContractChangePlanRoomPo contractChangePlanRoomPo);

+ 25 - 20
service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java

@@ -1,11 +1,12 @@
 package com.java110.store.api;
 
-import com.java110.dto.Dto;.ContractChangePlanRoomDto;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
 import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
-import com.java110.store.bmo.ContractChangePlanRoom.IDeleteContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.IGetContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.ISaveContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.IUpdateContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IDeleteContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IGetContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.ISaveContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IUpdateContractChangePlanRoomBMO;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,16 +29,17 @@ public class ContractChangePlanRoomApi {
 
     /**
      * 微信保存消息模板
-     * @serviceCode /contractChangePlanRoom/saveContractChangePlanRoom
-     * @path /app/contractChangePlanRoom/saveContractChangePlanRoom
+     *
      * @param reqJson
      * @return
+     * @serviceCode /contractChangePlanRoom/saveContractChangePlanRoom
+     * @path /app/contractChangePlanRoom/saveContractChangePlanRoom
      */
     @RequestMapping(value = "/saveContractChangePlanRoom", method = RequestMethod.POST)
     public ResponseEntity<String> saveContractChangePlanRoom(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "planId", "请求报文中未包含planId");
-Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
 
 
         ContractChangePlanRoomPo contractChangePlanRoomPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanRoomPo.class);
@@ -46,17 +48,18 @@ Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
 
     /**
      * 微信修改消息模板
-     * @serviceCode /contractChangePlanRoom/updateContractChangePlanRoom
-     * @path /app/contractChangePlanRoom/updateContractChangePlanRoom
+     *
      * @param reqJson
      * @return
+     * @serviceCode /contractChangePlanRoom/updateContractChangePlanRoom
+     * @path /app/contractChangePlanRoom/updateContractChangePlanRoom
      */
     @RequestMapping(value = "/updateContractChangePlanRoom", method = RequestMethod.POST)
     public ResponseEntity<String> updateContractChangePlanRoom(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "planId", "请求报文中未包含planId");
-Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
-Assert.hasKeyAndValue(reqJson, "prId", "prId不能为空");
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+        Assert.hasKeyAndValue(reqJson, "prId", "prId不能为空");
 
 
         ContractChangePlanRoomPo contractChangePlanRoomPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanRoomPo.class);
@@ -65,10 +68,11 @@ Assert.hasKeyAndValue(reqJson, "prId", "prId不能为空");
 
     /**
      * 微信删除消息模板
-     * @serviceCode /contractChangePlanRoom/deleteContractChangePlanRoom
-     * @path /app/contractChangePlanRoom/deleteContractChangePlanRoom
+     *
      * @param reqJson
      * @return
+     * @serviceCode /contractChangePlanRoom/deleteContractChangePlanRoom
+     * @path /app/contractChangePlanRoom/deleteContractChangePlanRoom
      */
     @RequestMapping(value = "/deleteContractChangePlanRoom", method = RequestMethod.POST)
     public ResponseEntity<String> deleteContractChangePlanRoom(@RequestBody JSONObject reqJson) {
@@ -83,19 +87,20 @@ Assert.hasKeyAndValue(reqJson, "prId", "prId不能为空");
 
     /**
      * 微信删除消息模板
+     *
+     * @param storeId 商户ID
+     * @return
      * @serviceCode /contractChangePlanRoom/queryContractChangePlanRoom
      * @path /app/contractChangePlanRoom/queryContractChangePlanRoom
-     * @param communityId 小区ID
-     * @return
      */
     @RequestMapping(value = "/queryContractChangePlanRoom", method = RequestMethod.GET)
-    public ResponseEntity<String> queryContractChangePlanRoom(@RequestParam(value = "communityId") String communityId,
-                                                      @RequestParam(value = "page") int page,
-                                                      @RequestParam(value = "row") int row) {
+    public ResponseEntity<String> queryContractChangePlanRoom(@RequestHeader(value = "shore-id") String storeId,
+                                                              @RequestParam(value = "page") int page,
+                                                              @RequestParam(value = "row") int row) {
         ContractChangePlanRoomDto contractChangePlanRoomDto = new ContractChangePlanRoomDto();
         contractChangePlanRoomDto.setPage(page);
         contractChangePlanRoomDto.setRow(row);
-        contractChangePlanRoomDto.setCommunityId(communityId);
+        contractChangePlanRoomDto.setStoreId(storeId);
         return getContractChangePlanRoomBMOImpl.get(contractChangePlanRoomDto);
     }
 }

+ 2 - 1
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IDeleteContractChangePlanRoomBMO.java

@@ -1,4 +1,5 @@
-package com.java110.api.bmo.contractChangePlanRoom;
+package com.java110.store.bmo.contractChangePlanRoom;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
 import org.springframework.http.ResponseEntity;
 
 public interface IDeleteContractChangePlanRoomBMO {

+ 2 - 1
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IGetContractChangePlanRoomBMO.java

@@ -1,4 +1,5 @@
-package com.java110.api.bmo.contractChangePlanRoom;
+package com.java110.store.bmo.contractChangePlanRoom;
+import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
 import org.springframework.http.ResponseEntity;
 public interface IGetContractChangePlanRoomBMO {
 

+ 2 - 1
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/ISaveContractChangePlanRoomBMO.java

@@ -1,5 +1,6 @@
-package com.java110.api.bmo.contractChangePlanRoom;
+package com.java110.store.bmo.contractChangePlanRoom;
 
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
 import org.springframework.http.ResponseEntity;
 public interface ISaveContractChangePlanRoomBMO {
 

+ 2 - 1
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IUpdateContractChangePlanRoomBMO.java

@@ -1,4 +1,5 @@
-package com.java110.api.bmo.contractChangePlanRoom;
+package com.java110.store.bmo.contractChangePlanRoom;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
 import org.springframework.http.ResponseEntity;
 
 public interface IUpdateContractChangePlanRoomBMO {

+ 5 - 19
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/DeleteContractChangePlanRoomBMOImpl.java

@@ -1,27 +1,13 @@
-package com.java110.api.bmo.contractChangePlanRoom.impl;
+package com.java110.store.bmo.contractChangePlanRoom.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.contractChangePlanRoom.IContractChangePlanRoomBMO;
 import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
-import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
+import com.java110.store.bmo.contractChangePlanRoom.IDeleteContractChangePlanRoomBMO;
 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.intf.contractChangePlanRoom.IContractChangePlanRoomInnerServiceSMO;
-import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
-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("deleteContractChangePlanRoomBMOImpl")
 public class DeleteContractChangePlanRoomBMOImpl implements IDeleteContractChangePlanRoomBMO {
@@ -39,7 +25,7 @@ public class DeleteContractChangePlanRoomBMOImpl implements IDeleteContractChang
         int flag = contractChangePlanRoomInnerServiceSMOImpl.deleteContractChangePlanRoom(contractChangePlanRoomPo);
 
         if (flag > 0) {
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }
 
         return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");

+ 8 - 21
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/GetContractChangePlanRoomBMOImpl.java

@@ -1,26 +1,15 @@
-package com.java110.api.bmo.contractChangePlanRoom.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.contractChangePlanRoom.IContractChangePlanRoomBMO;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
-import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
+package com.java110.store.bmo.contractChangePlanRoom.impl;
+
+import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.store.bmo.contractChangePlanRoom.IGetContractChangePlanRoomBMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.contractChangePlanRoom.IContractChangePlanRoomInnerServiceSMO;
-import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
-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.ArrayList;
 import java.util.List;
 
 @Service("getContractChangePlanRoomBMOImpl")
@@ -30,9 +19,7 @@ public class GetContractChangePlanRoomBMOImpl implements IGetContractChangePlanR
     private IContractChangePlanRoomInnerServiceSMO contractChangePlanRoomInnerServiceSMOImpl;
 
     /**
-     *
-     *
-     * @param  contractChangePlanRoomDto
+     * @param contractChangePlanRoomDto
      * @return 订单服务能够接受的报文
      */
     public ResponseEntity<String> get(ContractChangePlanRoomDto contractChangePlanRoomDto) {

+ 5 - 18
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/SaveContractChangePlanRoomBMOImpl.java

@@ -1,27 +1,14 @@
-package com.java110.api.bmo.contractChangePlanRoom.impl;
+package com.java110.store.bmo.contractChangePlanRoom.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.contractChangePlanRoom.IContractChangePlanRoomBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
-import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
+import com.java110.store.bmo.contractChangePlanRoom.ISaveContractChangePlanRoomBMO;
 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.intf.contractChangePlanRoom.IContractChangePlanRoomInnerServiceSMO;
-import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
-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("saveContractChangePlanRoomBMOImpl")
 public class SaveContractChangePlanRoomBMOImpl implements ISaveContractChangePlanRoomBMO {
@@ -42,7 +29,7 @@ public class SaveContractChangePlanRoomBMOImpl implements ISaveContractChangePla
         int flag = contractChangePlanRoomInnerServiceSMOImpl.saveContractChangePlanRoom(contractChangePlanRoomPo);
 
         if (flag > 0) {
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }
 
         return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");

+ 5 - 21
service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/UpdateContractChangePlanRoomBMOImpl.java

@@ -1,27 +1,13 @@
-package com.java110.api.bmo.contractChangePlanRoom.impl;
+package com.java110.store.bmo.contractChangePlanRoom.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.contractChangePlanRoom.IContractChangePlanRoomBMO;
 import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IWechatSmsTemplateInnerServiceSMO;
-import com.java110.po.wechatSmsTemplate.WechatSmsTemplatePo;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
+import com.java110.store.bmo.contractChangePlanRoom.IUpdateContractChangePlanRoomBMO;
 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.intf.contractChangePlanRoom.IContractChangePlanRoomInnerServiceSMO;
-import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
-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("updateContractChangePlanRoomBMOImpl")
 public class UpdateContractChangePlanRoomBMOImpl implements IUpdateContractChangePlanRoomBMO {
@@ -30,8 +16,6 @@ public class UpdateContractChangePlanRoomBMOImpl implements IUpdateContractChang
     private IContractChangePlanRoomInnerServiceSMO contractChangePlanRoomInnerServiceSMOImpl;
 
     /**
-     *
-     *
      * @param contractChangePlanRoomPo
      * @return 订单服务能够接受的报文
      */
@@ -41,7 +25,7 @@ public class UpdateContractChangePlanRoomBMOImpl implements IUpdateContractChang
         int flag = contractChangePlanRoomInnerServiceSMOImpl.updateContractChangePlanRoom(contractChangePlanRoomPo);
 
         if (flag > 0) {
-        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }
 
         return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");

+ 3 - 2
service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanRoomInnerServiceSMOImpl.java

@@ -1,8 +1,9 @@
 package com.java110.store.smo.impl;
 
 
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
 import com.java110.store.dao.IContractChangePlanRoomServiceDao;
-import com.java110.intf.contractChangePlanRoom.IContractChangePlanRoomInnerServiceSMO;
 import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
@@ -31,7 +32,7 @@ public class ContractChangePlanRoomInnerServiceSMOImpl extends BaseServiceSMO im
 
 
     @Override
-    public int saveContractChangePlanRoom(@RequestBody  ContractChangePlanRoomPo contractChangePlanRoomPo) {
+    public int saveContractChangePlanRoom(@RequestBody ContractChangePlanRoomPo contractChangePlanRoomPo) {
         int saveFlag = 1;
         contractChangePlanRoomServiceDaoImpl.saveContractChangePlanRoomInfo(BeanConvertUtil.beanCovertMap(contractChangePlanRoomPo));
         return saveFlag;