WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'dev_2nd_period_test'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!224
This commit is contained in:
高嵩
2022-10-31 15:47:33 +08:00
parent c1fd7561cc b0dee96efa
commit fb87fa3f08
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+1 -2
View File
@@ -57,9 +57,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
// @RequiresPermissions("params:collectManifest:list") // @RequiresPermissions("params:collectManifest:list")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag, @RequestParam(name = "flag") String flag,
@RequestParam(name = "userType", required = false) String userType,
@RequestParam(name = "cut") String cut) { @RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, userType, cut); List<Map<String, Object>> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+1 -1
View File
@@ -86,7 +86,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
* @param cut * @param cut
* @return * @return
*/ */
List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String userType, String cut); List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
/** /**
* 提交 * 提交
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -5
View File
@@ -757,7 +757,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String userType, String cut) { public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7 List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7
if (fieldList.size() != 0) { if (fieldList.size() != 0) {
//过滤列表字段(is_show_list-->列表是否显示0否 1是) //过滤列表字段(is_show_list-->列表是否显示0否 1是)
@@ -780,10 +780,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
OnlCgformField onlCgformField = fieldList.get(i); OnlCgformField onlCgformField = fieldList.get(i);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
String dbFieldName = onlCgformField.getDbFieldName(); String dbFieldName = onlCgformField.getDbFieldName();
if ("report_time".equals(dbFieldName)
&& (CollectManifestUserTypeEnum.SDT.getValue().equals(userType) || CollectManifestUserTypeEnum.DRE.getValue().equals(userType))) {
continue;
}
if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) {
map.put("click5", true); map.put("click5", true);
if("nio_number".equals(dbFieldName)) { if("nio_number".equals(dbFieldName)) {
jero-web/src/components/tableCollection/index.vue
+1 -2
View File
@@ -639,8 +639,7 @@
} }
let params = { let params = {
paramsManifestId: paramsManifestid, paramsManifestId: paramsManifestid,
flag: '7', flag: '7'
userType: userType
} }
getAction(url, params).then((res) => { getAction(url, params).then((res) => {
if (res.success) { if (res.success) {