|
|
@@ -6,6 +6,7 @@ import com.siwei.apply.domain.res.StorageYearStatisticsRes;
|
|
|
import com.siwei.apply.domain.res.TrendStatisticsData;
|
|
|
import com.siwei.apply.domain.res.TrendStatisticsRes;
|
|
|
import com.siwei.apply.domain.res.TrendUseStatisticsData;
|
|
|
+import com.siwei.apply.domain.vo.IdsVo;
|
|
|
import com.siwei.apply.domain.vo.LandSupplyProjectVO;
|
|
|
import com.siwei.apply.service.cadastre.impl.StorageServiceImpl;
|
|
|
import com.siwei.common.core.domain.R;
|
|
|
@@ -614,11 +615,12 @@ public class StorageController extends BaseController {
|
|
|
@GetMapping("/schedule/list")
|
|
|
public R<?> scheduleList(
|
|
|
@RequestParam(value = "sourceType") String sourceType,
|
|
|
+ @RequestParam(value = "nf") String nf,
|
|
|
@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
|
|
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
|
|
try {
|
|
|
startPage();
|
|
|
- List<Map<String, Object>> resList = storageServiceImpl.actualList("gj_shouchu_xiangmu",sourceType);
|
|
|
+ List<Map<String, Object>> resList = storageServiceImpl.actualList("gj_shouchu_xiangmu",sourceType,"",nf);
|
|
|
return R.ok(getDataTable(resList));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
@@ -647,11 +649,12 @@ public class StorageController extends BaseController {
|
|
|
|
|
|
@GetMapping("/actual/list")
|
|
|
public R<?> actualList(
|
|
|
+ @RequestParam(value = "year", required = false) String year,
|
|
|
@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
|
|
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
|
|
try {
|
|
|
startPage();
|
|
|
- List<Map<String, Object>> resList = storageServiceImpl.actualList("gj_shouchu_xiangmu_shiji","");
|
|
|
+ List<Map<String, Object>> resList = storageServiceImpl.actualList("gj_shouchu_xiangmu_shiji","",year,"");
|
|
|
return R.ok(getDataTable(resList));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
@@ -660,6 +663,28 @@ public class StorageController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * type storage planType schedule
|
|
|
+ * 根据年份进行删除
|
|
|
+ * @param
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DeleteMapping("")
|
|
|
+ public R<Void> Delete( @RequestParam(value = "type", required = true) String type,
|
|
|
+ @RequestParam(value = "planType", required = true) String planType,
|
|
|
+ @RequestParam(value = "year", required = true) String year) {
|
|
|
+ try {
|
|
|
+ if (year == null || year.isEmpty()) {
|
|
|
+ return R.fail("年份不能为空");
|
|
|
+ }
|
|
|
+ storageServiceImpl.deleteByYear(type,planType,year);
|
|
|
+ return R.ok();
|
|
|
+ } catch (Exception e) {
|
|
|
+ return R.fail(e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|