Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -100,5 +100,10 @@ public class PlanController {
     public HttpRespMsg receivePlan(String ids){
         return planService.receivePlan(ids);
     }
+
+    @RequestMapping("/cancellationReceive")
+    public HttpRespMsg cancellationReceive(Integer id){
+        return planService.cancellationReceive(id);
+    }
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/PlanProcedureTotal.java

@@ -74,6 +74,9 @@ public class PlanProcedureTotal extends Model<PlanProcedureTotal> {
     @TableField(exist = false)
     private boolean needAddCircle;
 
+    @TableField(exist = false)
+    private boolean cancellationReceive;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanService.java

@@ -42,4 +42,6 @@ public interface PlanService extends IService<Plan> {
     HttpRespMsg deletePeople(Integer id);
 
     HttpRespMsg receivePlan(String ids);
+
+    HttpRespMsg cancellationReceive(Integer id);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -794,6 +794,24 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg cancellationReceive(Integer id) {
+        HttpRespMsg msg=new HttpRespMsg();
+        String userId = request.getHeader("token");
+        List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("plan_procedure_id", id));
+        if(prodProcedureTeams.size()>0){
+            Optional<ProdProcedureTeam> first = prodProcedureTeams.stream().filter(ps -> ps.getUserId().equals(userId)).findFirst();
+            if(first.isPresent()){
+                ProdProcedureTeam prodProcedureTeam = first.get();
+                prodProcedureTeam.setStatus(0);
+                if(!prodProcedureTeamService.updateById(prodProcedureTeam)){
+                    msg.setError("验证失败");
+                }
+            }
+        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg receivePlan(String ids) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -983,6 +1001,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                             if(procedureTeamList.stream().anyMatch(pl->pl.getProgress()>0&&pl.getStatus()==4)){
                                 ps.setNeedAddCircle(true);
                             }
+                            if(procedureTeamList.stream().anyMatch(pl->pl.getUserId().equals(userId)&&pl.getStatus()==1)){
+                                ps.setCancellationReceive(true);
+                            }
                         }
                     });
                     msg.setData(procedureTotals);

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponentDetil.vue

@@ -31,10 +31,10 @@
           <el-table-column label="工序名称" width="400">
             <template slot-scope="scope">
                 <div class="disFlexscope">
-                    <span v-if="!scope.row.needAddCircle" class="yuanquan"></span>
+                    <span v-if="scope.row.needAddCircle" class="yuanquan"></span>
                     <span>{{ scope.row.prodProcedure.name }}</span>
                 </div>
-              </template>
+            </template>
           </el-table-column>
           <el-table-column label="单件工时" width="150">
             <template slot-scope="scope">{{
@@ -66,6 +66,11 @@
           <el-table-column label="组员" width="150">
             <template slot-scope="scope">{{ scope.row.teamNames }}</template>
           </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.needAddCircle" type="primary" @click="cancellationReceive(scope)">取消接收</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <!-- <div v-if="TabIndex == 1"  v-loading="tableDataLoading">
@@ -162,6 +167,34 @@ export default {
       this.TabIndex = index;
       this.getPlanDetail();
     },
+    cancellationReceive(item){
+      this.http.post(
+              "/plan/cancellationReceive",
+              {
+                id: item.row.id,
+              },
+              (res) => {
+                if (res.code == "ok") {
+                  this.$message({
+                    message: '操作成功',
+                    type: "error",
+                  });
+                  this.getPlanDetail()
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error",
+                  });
+                }
+              },
+              (error) => {
+                this.$message({
+                  message: error,
+                  type: "error",
+                });
+              }
+            );
+    },
     getPlanDetail() {
       this.tableDataLoading = true;
       this.http.post(