Commit 919fd56a authored by litengwei's avatar litengwei

离线巡检查询接口修改

parent f35cd88c
...@@ -987,7 +987,9 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -987,7 +987,9 @@ public class PlanTaskController extends AbstractBaseController {
public CommonResponse queryLeavePlanTask() { public CommonResponse queryLeavePlanTask() {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams); //String loginOrgCode = // getOrgCode(reginParams);
String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("userId", userId); params.put("userId", userId);
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
......
...@@ -1340,7 +1340,8 @@ public class PointController extends AbstractBaseController { ...@@ -1340,7 +1340,8 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8")
public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间(不传为全部同步)", required = false) @RequestParam(required=false) String startTime) { public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间(不传为全部同步)", required = false) @RequestParam(required=false) String startTime) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams); // String loginOrgCode = getOrgCode(reginParams);
String loginOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
......
...@@ -934,7 +934,7 @@ ...@@ -934,7 +934,7 @@
LEFT JOIN s_department d on d.id = p.charge_dept_id --> LEFT JOIN s_department d on d.id = p.charge_dept_id -->
WHERE p.is_delete = 0 WHERE p.is_delete = 0
AND p.offline = 1 AND p.offline = 1
<if test="orgCode != null and orgCode != ''">AND p.org_code = #{orgCode}</if> <if test="orgCode != null and orgCode != ''">AND p.biz_org_code = #{orgCode}</if>
<if test="startTime !=null and startTime != ''">AND p.last_update_time <![CDATA[>= ]]> STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if> <if test="startTime !=null and startTime != ''">AND p.last_update_time <![CDATA[>= ]]> STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if>
</select> </select>
<select id="getPoints" resultType="Map"> <select id="getPoints" resultType="Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment