Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java

@@ -143,6 +143,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除
         filterChainDefinitionMap.put("/project/projectTaskInventoryEO/processCall", "anon"); // 项目库-任务清单 工作流处理数据接口排除
         filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
         filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
 
         // 添加自己的过滤器并且取名为jwt

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1660,8 +1660,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -497,8 +498,16 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -69,6 +69,7 @@ import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -905,8 +906,16 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java

@@ -43,7 +43,9 @@ public class TaskCommonQuery {
 	private String prcNum;
 
 	@ApiModelProperty(value = "流程类型")
-	private String prcType = FlowTypeEnum.RWQRLC.getValue();
+	private String prcType;
+
+	private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
 
 	@ApiModelProperty(value = "高级搜索字符串")
 	private String advanceSearchVOStr;