完善代码;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/DinasOrganizationServiceImpl.java

@@ -4,11 +4,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.hibernate.Session;
-import org.hibernate.query.Query;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.hibernate5.HibernateTemplate;
 
+import com.beecode.bap.staff.BapContext;
 import com.beecode.bap.staff.dao.StaffDAO;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
@@ -23,6 +22,9 @@ public class DinasOrganizationServiceImpl implements DinasOrganizationService {
 	@Autowired
 	private StaffDAO staffDAO;
 	
+	@Autowired
+	public BapContext bapContext;
+	
 	@Override
 	public KObject queryOrganizationByName(String name) {
 		return dinasOrganizationDao.queryOrganizationByName(name);
@@ -67,6 +69,16 @@ public class DinasOrganizationServiceImpl implements DinasOrganizationService {
 		return ResponseObj.success("查询成功", staffList);
 	}
 
-	
+	public KObject getCurrentRegionalCompany() {
+		return load(getCurrentRegionalCompanyId());
+	}
+
+	@Override
+	public UUID getCurrentRegionalCompanyId() {
+		Map<String, String> map = bapContext.getCurrentUserDatas();
+		String currentRegionalCompany = map.get("currentRegionalCompany");
+		JSONObject obj = new JSONObject(currentRegionalCompany);
+		return UUID.fromString(obj.getString("id"));
+	}
 
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/DinasOrganizationService.java

@@ -2,7 +2,6 @@ package com.xyst.dinas.biz.service;
 
 import java.util.List;
 import java.util.UUID;
-
 import com.beecode.bcp.type.KObject;
 
 public interface DinasOrganizationService {
@@ -20,4 +19,13 @@ public interface DinasOrganizationService {
 	List<UUID> queryStaffByPostId(String postId);
 
 	Object queryStaffByRegionalCompany(UUID fromString);
+	
+	/**
+	 * 获取当前区域公司
+	 * @return
+	 */
+	KObject getCurrentRegionalCompany();
+	
+	
+	UUID getCurrentRegionalCompanyId();
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasOrganizationController.java

@@ -8,15 +8,10 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.beecode.inz.common.exception.BusinessException;
-import com.xyst.dinas.biz.enumeration.BizErrorCodeEnum;
 import com.xyst.dinas.biz.service.DinasOrganizationService;
-import com.xyst.dinas.biz.service.PositionService;
 
 @RestController
 public class DinasOrganizationController {

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/WarnSettingController.java

@@ -25,7 +25,7 @@ import com.xyst.dinas.biz.warn.service.WarningService;
 public class WarnSettingController {
 
 	@Autowired
-	private WarningService warningSettingService;
+	private WarningService warningService;
 	
 	//更新预警设置
 //	@PostMapping("/warnsetting/update")
@@ -40,14 +40,13 @@ public class WarnSettingController {
 	public KObject queryWarnSetting(@PathVariable UUID id) {
 		
 		Assert.notNull(id,"The id must not be null");
-		return warningSettingService.queryWarnSettingById(id);
+		return warningService.queryWarnSettingById(id);
 	}
 
 	//查询预警汇总信息
 	@GetMapping("/warnRecode/groupInfo")
-	public ResponseObj groupInfo(@RequestParam(name = "regionalCompanyIds") List<UUID> regionalCompanyIds, @RequestParam(name = "targets")List<String> targets) {
-        HashMap<String,Object> groupInfo = warningSettingService.warnRecodeGroupInfo(regionalCompanyIds,targets);
-
+	public Object groupInfo(@RequestParam(name = "regionalCompanyIds") List<UUID> regionalCompanyIds, @RequestParam(name = "targets")List<String> targets) {
+        HashMap<String,Object> groupInfo = warningService.warnRecodeGroupInfo(regionalCompanyIds,targets);
 		return ResponseObj.success("查询成功", groupInfo);
 	}
 

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

@@ -22,6 +22,7 @@ import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.entity.BaseEntity;
 import com.xyst.dinas.contract.entity.CommonResult;
@@ -42,6 +43,8 @@ public class ContractController {
 	private ContractInfoDao contractInfoDao;
 	@Autowired
 	private ContractDao contractDao;
+	@Autowired
+	private DinasOrganizationService dinasOrgService;
 
 	@PostMapping("/contractInfo/create")
 	public UUID create(@RequestBody String contractInfo) {
@@ -175,15 +178,16 @@ public class ContractController {
 	}
 
 	/**
-	 * 查询某区域公司下执行中的合同(指定时间范围内有效的)
+	 * 查询当前区域公司下执行中的合同(指定时间范围内有效的)
 	 * @param regionalCompanyId
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
-	@GetMapping("/contract/exeContractListInLife/{regionalCompanyId}/{startDate}/{endDate}")
-	public List<KObject> queryExeContractListInLife(@PathVariable UUID regionalCompanyId,
+	@GetMapping("/contract/exeContractListInLife/{startDate}/{endDate}")
+	public List<KObject> queryExeContractListInEffect(
 			@DateTimeFormat(pattern="yyyy-MM-dd") @PathVariable Date startDate,@DateTimeFormat(pattern="yyyy-MM-dd") @PathVariable Date endDate){
+		UUID regionalCompanyId = dinasOrgService.getCurrentRegionalCompanyId();
 		return contractService.queryExeContractListInLife(regionalCompanyId, startDate, endDate);
 	}