diff --git a/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java b/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java index 176441a..69bca26 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java @@ -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 varList = curriculumService.list(page); //列出Curriculum列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java index 0571d02..82ac28a 100644 --- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java +++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java @@ -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 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); diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index fc5be9a..bd9729a 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -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 f left join BUS_HIDDENDANGERCHECKSTANDARD_CUSTOM l on f.CUSTOM_ID = l.CUSTOM_ID