wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-07-08 17:59:59 +08:00
parent 14261c4f45
commit 46c6259aac
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java
View File

@ -69,6 +69,14 @@ public class CurriculumController extends BaseController {
pd.put("ENDTIME", pd.getString("ENDTIME") + " 23:59:59");
}
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (StringUtils.isNotEmpty(pd.getString("CLASS_ID"))) {
pd.remove("CLASS_ID");
}
if (StringUtils.isNotEmpty(pd.getString("ISSELL"))) {
pd.remove("ISSELL");
}
page.setPd(pd);
List<PageData> varList = curriculumService.list(page); //列出Curriculum列表
map.put("varList", varList);

6
src/main/java/com/zcloud/controller/hidden/HiddenController.java
View File

@ -23,6 +23,7 @@ import com.zcloud.util.*;
import com.zcloud.util.message.MessageService;
import net.sf.json.JSONArray;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -37,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 说明：隐患 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com
@ -2125,6 +2127,10 @@ public class HiddenController extends BaseController {
page.setPd(pd);
List<PageData> varList = hiddenService.hiddenlist(page); // 列出Hidden列表
if(StringUtils.equals(pd.getString("DISPOSESTATE"), "2")) {
varList = varList.stream().parallel()
.filter(data -> StringUtils.isNotEmpty(data.getString("RECTIFICATIONDEADLINE")) && StringUtils.isNotEmpty(data.getString("RECTIFICATIONORNAME"))).collect(Collectors.toList());
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

3
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml
View File

@ -138,7 +138,8 @@
s.NAME AS SCREENTYPENAME,
l.TYPE as LISTTYPE,
l.START_DATE,
l.END_DATE
l.END_DATE,
l.NAME AS LIST_NAME
from
<include refid="tableName"></include> f
left join BUS_HIDDENDANGERCHECKSTANDARD_CUSTOM l on f.CUSTOM_ID = l.CUSTOM_ID