优化代码

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

@@ -27,12 +27,13 @@
         left join t_dict d on rrp.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
         left join r_repair_setting rs on rs.repair_type = rrp.repair_type and rs.status_cd = '0'
         where 1 = 1
-        and rrp.state = '1800'
         and rs.return_visit_flag in ('002','003')
         <if test="state == 'waiting'">
+            and rrp.state = '1800'
             and t.repair_id is null
         </if>
         <if test="state == 'finish'">
+            and rrp.state = '1900'
             and t.repair_id is not null
         </if>
         <if test="visitId !=null and visitId != ''">

service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java

@@ -3,7 +3,10 @@ package com.java110.community.bmo.repairReturnVisit.impl;
 import com.java110.community.bmo.repairReturnVisit.ISaveRepairReturnVisitBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.repair.RepairDto;
+import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairReturnVisitInnerServiceSMO;
+import com.java110.po.owner.RepairPoolPo;
 import com.java110.po.repairReturnVisit.RepairReturnVisitPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,9 @@ public class SaveRepairReturnVisitBMOImpl implements ISaveRepairReturnVisitBMO {
     @Autowired
     private IRepairReturnVisitInnerServiceSMO repairReturnVisitInnerServiceSMOImpl;
 
+    @Autowired
+    private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
+
     /**
      * 添加小区信息
      *
@@ -28,11 +34,21 @@ public class SaveRepairReturnVisitBMOImpl implements ISaveRepairReturnVisitBMO {
         repairReturnVisitPo.setVisitId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_visitId));
         int flag = repairReturnVisitInnerServiceSMOImpl.saveRepairReturnVisit(repairReturnVisitPo);
 
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        if (flag < 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+        }
+
+        RepairPoolPo repairPoolPo = new RepairPoolPo();
+        repairPoolPo.setRepairId(repairReturnVisitPo.getRepairId());
+        repairPoolPo.setState(RepairDto.STATE_COMPLATE);
+        flag = repairInnerServiceSMOImpl.updateRepair(repairPoolPo);
+
+        if (flag < 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
         }
 
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+
     }
 
 }