From e262c9dd1b5f00b5f0ee4ea85a51a6e769c39590 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 09 Aug 2021 15:31:18 +0800
Subject: [PATCH] 1.现场检查
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index d18852d..21b7e87 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -16,11 +16,13 @@
*/
package org.springblade.modules.information.controller;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import com.alibaba.fastjson.JSON;
import org.springblade.common.cache.DictCache;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
@@ -38,12 +40,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
+
/**
* 控制器
@@ -59,7 +67,6 @@
private final IInformationService informationService;
private final IDeptService iDeptService;
-
/**
* 详情
@@ -89,8 +96,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入information")
- public R<IPage<InformationVO>> page(InformationVO information, Query query) {
- IPage<InformationVO> pages = informationService.selectInformationPage(Condition.getPage(query), information);
+ public R<IPage<Information>> page(Information information, Query query) {
+ IPage<Information> pages = informationService.selectInformationPage(Condition.getPage(query), information);
return R.data(pages);
}
@@ -146,7 +153,9 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- arg.test01(arg.url + "/information/save", information);
+ String json=JSON.toJSONString(information);
+ com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+ //arg.test01(arg.url + "/information/save", information);
return R.status(informationService.save(information));
}
@@ -157,7 +166,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
- arg.test01(arg.url + "/information/update", information);
+ //arg.test01(arg.url + "/information/update", information);
return R.status(informationService.updateById(information));
}
@@ -185,13 +194,13 @@
informationService.deleteIn(strArray[i]);
informationService.deleteSh(strArray[i]);
informationService.deleteMe(strArray[i]);
- arg.sendPostRemoveByIds(arg.url + "/information/remove", strArray[i]);
+ //arg.sendPostRemoveByIds(arg.url + "/information/remove", strArray[i]);
}
for (int j = 0; j < strArrays.length; j++) {
//机构删除
informationService.deleteDept(strArrays[j]);
- arg.sendPostRemoveByIds(arg.url + "/information/deleteDept", strArrays[j]);
+ //arg.sendPostRemoveByIds(arg.url + "/information/deleteDept", strArrays[j]);
}
return R.success("删除成功");
@@ -214,6 +223,7 @@
List<Map<Object, Object>> lists = informationService.selectHold(deptid);
return R.data(lists);
}
+
/**
* 派遣服务单位统计
*/
@@ -233,25 +243,34 @@
}
/**
- * 保安派遣数量统计
+ * 社保统计
*/
@PostMapping("/selectSoil")
public R selectSoil(String deptid) {
List<Map<Object, Object>> lists = informationService.selectSoil(deptid);
List<Map<String, Object>> list = new ArrayList<>();
- for (int i=0;i<lists.size();i++){
+ for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
String numj = lists.get(i).get("numj").toString();
- Integer a=Integer.valueOf(numj);
+ Integer a = Integer.valueOf(numj);
String numz = lists.get(i).get("numz").toString();
- Integer b=Integer.valueOf(numz);
- Integer c=b-a;
- map.put("numj",a);
- map.put("nmuwj",c);
+ Integer b = Integer.valueOf(numz);
+ Integer c = b - a;
+ map.put("numj", a);
+ map.put("nmuwj", c);
list.add(map);
}
return R.data(list);
}
+ public static void main(String[] args) {
+ Information information = new Information();
+ information.setAddress("2");
+ information.setDepartmentid("123");
+ String json=JSON.toJSONString(information);//关键
+ com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+ System.out.println("生成文件完成！");
+ }
+
}
--
Gitblit v1.9.3