厂家采购作废修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@@ -91,6 +91,6 @@ public interface BusVehicleApplyFeign {
     ResultBean<AppVehicleApplySzVo> getVehicleApplyTopInfo(@PathVariable("sid") String sid);
 
     @ApiOperation(value = "采购申请作废")
-    @PutMapping(value = "/abandonApply/{sid}")
-    ResultBean abandonApply(@PathVariable("sid") String sid);
+    @PostMapping(value = "/abandonApply")
+    ResultBean abandonApply(@RequestBody String[] sids);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java

@@ -103,7 +103,7 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
     }
 
     @Override
-    public ResultBean abandonApply(String sid) {
+    public ResultBean abandonApply(String[] sids) {
         return null;
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java

@@ -11,6 +11,7 @@ import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,5 +42,7 @@ public interface BusVehicleApplyMapper extends BaseMapper<BusVehicleApply> {
 
     AppVehicleApplyVo getVehicleApply(String sid);
 
-    ResultBean abandonApply(String sid);
+    int abandonApply(@Param("sidsList") List<String> sidsList);
+
+    int selectByNodeState(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -82,6 +82,16 @@
     <update id="abandonApply">
         update bus_vehicle_apply
         set nodeState = '作废'
-        where sid = #{sid}
+        where sid in
+        <foreach item="sid" collection="sidsList" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
     </update>
+
+    <select id="selectByNodeState" resultType="int">
+        select count(*)
+        from bus_vehicle_apply
+        where nodeState &lt;&gt; '已办结'
+          and find_in_set(sid, #{join})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java

@@ -114,8 +114,8 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
     }
 
     @Override
-    public ResultBean abandonApply(String sid) {
-        return busVehicleApplyService.abandonApply(sid);
+    public ResultBean abandonApply(String[] sids) {
+        return busVehicleApplyService.abandonApply(sids);
     }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -826,7 +826,15 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb.success().setData(vo);
     }
 
-    public ResultBean abandonApply(String sid) {
-        return baseMapper.abandonApply(sid);
+    public ResultBean abandonApply(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是已办结的
+        int count = baseMapper.selectByNodeState(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("作废的数据中包含流程未完结的数据，不允许作废");
+        }
+        List<String> sidsList = Arrays.asList(sids);
+        int i = baseMapper.abandonApply(sidsList);
+        return rb.success();
     }
 }