优化 评价功能完成

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

@@ -157,18 +157,14 @@
         <if test="context !=null and context != ''">
             , t.context= #{context}
         </if>
-        <if test="repairId !=null and repairId != ''">
-            , t.repair_id= #{repairId}
-        </if>
+
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            , t.staff_id= #{staffId}
-        </if>
+
         <if test="end_time !=null ">
             , t.end_time= #{end_time}
         </if>
@@ -180,6 +176,15 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
 
     </update>
 

service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java

@@ -1,11 +1,14 @@
 package com.java110.community.service.repair;
 
 import com.java110.community.dao.IRepairServiceDao;
+import com.java110.community.dao.IRepairUserServiceDao;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.appraise.AppraiseDto;
 import com.java110.dto.repair.RepairDto;
+import com.java110.dto.repair.RepairUserDto;
 import com.java110.intf.common.appraise.ISaveAppraiseService;
 import com.java110.intf.community.repair.IAppraiseRepairService;
+import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,17 +28,29 @@ public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
     @Autowired
     private IRepairServiceDao repairServiceDaoImpl;
 
+    @Autowired
+    private IRepairUserServiceDao repairUserServiceDaoImpl;
+
     @Override
     @Java110Transactional
     public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto) {
 
-        //将工单表的状态修改为完成
+
         Map info = new HashMap();
         info.put("repairId", appraiseDto.getObjId());
+        info.put("staffId", appraiseDto.getAppraiseUserId());
+        info.put("state", RepairUserDto.STATE_DOING);
+        info.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        info.put("context", "评价完成");
+        repairUserServiceDaoImpl.updateRepairUserInfoInstance(info);
+        //将工单表的状态修改为完成
+        info = new HashMap();
+        info.put("repairId", appraiseDto.getObjId());
         info.put("statusCd", "0");
         info.put("state", RepairDto.STATE_RETURN_VISIT);
         repairServiceDaoImpl.updateRepairInfoInstance(info);
 
+
         //评价表中加入评价内容
         appraiseDto.setParentAppraiseId("-1");
         appraiseDto.setObjType(AppraiseDto.OBJ_TYPE_REPAIR);