Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranCarInfoController.java

@@ -21,15 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/tranCarInfo")
 public class TranCarInfoController {
-    @Autowired
-    private ITranCarInfoService tranCarInfoService;
 
-    /**
-     * 更改反馈状态
-     */
-    @PostMapping("/api/editFeedbackStatus")
-    public String editFeedbackStatus(@RequestBody String id){
-        return tranCarInfoService.editFeedbackStatus(id);
-    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranProcessInfoController.java

@@ -58,7 +58,13 @@ public class TranProcessInfoController {
         return tranProcessInfoService.insertTranCar(tranProcessInfo);
     }
 
-
+    /**
+     * 更改反馈状态
+     */
+    @PostMapping("/api/editFeedbackStatus")
+    public String editFeedbackStatus(@RequestBody String id){
+        return tranProcessInfoService.editFeedbackStatus(id);
+    }
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -206,6 +206,17 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     @TableField(exist = false)
     private Date endDate;
 
+    /**
+     * 反馈状态标识(1执行中3已完成)
+     */
+    @TableField(exist = false)
+    private String feedbackStatusFlag;
+    /**
+     * 反馈状态
+     */
+    @TableField(exist = false)
+    private String feedbackStatus;
+
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranCarInfoService.java

@@ -13,11 +13,4 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ITranCarInfoService extends IService<TranCarInfo> {
 
-    /**
-     * 更改反馈状态
-     *
-     * @param id
-     * @return
-     */
-    String editFeedbackStatus(String id);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranProcessInfoService.java

@@ -44,4 +44,12 @@ public interface ITranProcessInfoService extends IService<TranProcessInfo> {
      */
     String insertTranCar(TranProcessInfo tranProcessInfo);
 
+    /**
+     * 更改反馈状态
+     *
+     * @param id
+     * @return
+     */
+    String editFeedbackStatus(String id);
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranCarInfoServiceImpl.java

@@ -24,36 +24,6 @@ import java.util.List;
  */
 @Service
 public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranCarInfo> implements ITranCarInfoService {
-    @Autowired
-    private ITranCarInfoService tranCarInfoService;
-    @Autowired
-    private ICommonBillOperateHisService billOperateHisService;
 
 
-    /**
-     * 更改反馈状态
-     * @param id
-     * @return
-     */
-    public String editFeedbackStatus(String id){
-        //查询反馈信息
-        TranCarInfo tranCarInfo = this.selectById(id);
-        if(tranCarInfo != null){
-            if(StatusEnum.FEEDBACK_DO.getFlag().equals(tranCarInfo.getFeedbackStatusFlag())){
-                tranCarInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_COMPLETED.getFlag());
-                tranCarInfo.setFeedbackStatus(StatusEnum.FEEDBACK_COMPLETED.getName());
-            }else{
-                tranCarInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
-                tranCarInfo.setFeedbackStatus(StatusEnum.FEEDBACK_DO.getName());
-            }
-            this.updateById(tranCarInfo);
-            // 插入操作历史
-            String staffName = this.billOperateHisService.getStaffAndName();
-            // 插入操作历史
-            this.billOperateHisService.saveBillOperateHis(tranCarInfo.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
-                    tranCarInfo.getStatus(), null, "");
-            return "OK";
-        }
-        return "NG";
-    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -144,4 +144,31 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             return "NG";
         }
     }
+
+    /**
+     * 更改反馈状态
+     * @param id
+     * @return
+     */
+    public String editFeedbackStatus(String id){
+        //查询反馈信息
+        TranProcessInfo tranProcessInfo = this.selectById(id);
+        if(tranProcessInfo != null){
+            if(StatusEnum.FEEDBACK_DO.getFlag().equals(tranProcessInfo.getFeedbackStatusFlag())){
+                tranProcessInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_COMPLETED.getFlag());
+                tranProcessInfo.setFeedbackStatus(StatusEnum.FEEDBACK_COMPLETED.getName());
+            }else{
+                tranProcessInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
+                tranProcessInfo.setFeedbackStatus(StatusEnum.FEEDBACK_DO.getName());
+            }
+            this.updateById(tranProcessInfo);
+            // 插入操作历史
+            String staffName = this.billOperateHisService.getStaffAndName();
+            // 插入操作历史
+            this.billOperateHisService.saveBillOperateHis(tranProcessInfo.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
+                    tranProcessInfo.getStatus(), null, "");
+            return "OK";
+        }
+        return "NG";
+    }
 }