guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

处理余下冲突

0927cmt
zhaoyu 2024-02-06 14:06:32 +08:00
parent 5deb7d2b03
commit c107ac92bb
4 changed files with 12 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/app/AppPromiseController.java
View File

@ -18,10 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 说明：手机承诺书表

73
src/main/java/com/zcloud/controller/map/MapEightController.java
View File

@ -217,79 +217,6 @@ public class MapEightController extends BaseController {
}
/**
* 根据id以及类型获取数据 //曹妃甸东
*
* @param id 数据id
* @param type 数据类型 动火 等等
* @return
*/
@RequestMapping(value = "/getByIdCfdD")
@ResponseBody
public Object getByIdCfdD(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
PageData pd = this.getPageData();
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
paramMap.add("id", pd.getString("id"));
paramMap.add("TYPE", pd.getString("TYPE"));
paramMap.add("HOTWORK_ID", pd.getString("HOTWORK_ID"));
Map<String, Object> result =
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getByIdOrder", paramMap, Map.class);
return result;
}
/*曹妃甸专用接口-开始*/
/**
* @Description: 获取八项作业所有作业人员
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getAllWorkUserCards")
@ResponseBody
public ReturnMap getAllWorkUserCards() {
PageData pageData = this.getPageData();
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
Map<String, Object> result =
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllWorkUserCards", paramMap, Map.class);
return ReturnMap.ok(result);
}
/**
* @Description: 获取八项作业所有作业人员
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getAllTickets")
@ResponseBody
public ReturnMap getAllTickets() {
PageData pageData = this.getPageData();
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
Map<String, Object> result =
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllTickets", paramMap, Map.class);
return ReturnMap.ok(result);
}
/**
* @Description: 获取八项作业所有作业人员
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/findEightsByUserId")
@ResponseBody
public ReturnMap findEightsByUserId() {
PageData pageData = this.getPageData();
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
paramMap.add("empNo", pageData.getString("empNo"));
paramMap.add("TYPE", pageData.getString("TYPE"));
Map<String, Object> result =
restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findEightsByUserId", paramMap, Map.class);
return ReturnMap.ok(result);
}
/*曹妃甸专用接口-结束*/
}

1
src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
View File

@ -9,7 +9,6 @@ import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.map.MapEightService;
import com.zcloud.service.map.MapKetProjectService;
import com.zcloud.service.system.UsersService;
import com.zcloud.service.map.CorpDepartmentService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import org.apache.commons.lang.StringUtils;

11
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -540,6 +540,17 @@ public class UsersServiceImpl implements UsersService {
// map.put("result",errInfo);
return ReturnMap.ok();
}
@Override
public Object getCurrentPersonnelData(PageData pd) throws Exception {
return null;
}
@Override
public Object getPersonPositioningStatistics(PageData pd) throws Exception {
return null;
}
@Override
public Object getCurrentLocationCount(PageData pd){
Map<String,Object> map = new HashMap<String,Object>();