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

文档库--列表和新增

Browse Source
This commit is contained in:
zhn
2022-02-22 11:12:56 +08:00
parent 24c7c76744
commit eb75eb329a
2 changed files with 90 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+2 -2
View File
@@ -68,9 +68,9 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
*/ */
@AutoLog(value = "分页查询") @AutoLog(value = "分页查询")
@ApiOperation(value="分页查询", notes="分页查询") @ApiOperation(value="分页查询", notes="分页查询")
@GetMapping(value = "/queryPageInfo") @PostMapping(value = "/queryPageInfo")
@ResponseBody @ResponseBody
public JSONObject queryPageInfo(@RequestParam(name="parameter",required=false) Map<String,Object> parameter) { public JSONObject queryPageInfo(@RequestBody Map<String,Object> parameter) {
IPage infoPage = bussDocumentLibraryEOService.getInfoPage(parameter); IPage infoPage = bussDocumentLibraryEOService.getInfoPage(parameter);
Result<IPage> ok = Result.OK(infoPage); Result<IPage> ok = Result.OK(infoPage);
JSONObject jsonResult = JSONObject.fromObject(ok); JSONObject jsonResult = JSONObject.fromObject(ok);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+18 -32
View File
@@ -239,40 +239,33 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<OnlCgformField> fieldDateList = fieldList.stream().filter(e -> "Date".equals(e.getDbType())).collect(Collectors.toList()); List<OnlCgformField> fieldDateList = fieldList.stream().filter(e -> "Date".equals(e.getDbType())).collect(Collectors.toList());
//文件类型字段 //文件类型字段
List<OnlCgformField> fieldFileList = fieldList.stream().filter(e -> "file".equals(e.getFieldShowType())).collect(Collectors.toList()); List<OnlCgformField> fieldFileList = fieldList.stream().filter(e -> "file".equals(e.getFieldShowType())).collect(Collectors.toList());
//以下3行代码为测试数据(暂时保留)
// LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(BussDocumentLibraryEO::getId,"1");
// List<Map<String, Object>> dateList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code"; String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code";
String mustValues = getMustValues(); String mustValues = getMustValues();
//字段 //字段
StringBuilder fieldsBuilder = new StringBuilder(); StringBuilder fieldsBuilder = new StringBuilder();
//数据值 //数据值
StringBuilder valuesBuilder = new StringBuilder(); StringBuilder valuesBuilder = new StringBuilder();
// for (Map.Entry<String, Object> entry : dateList.get(0).entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet())
for (Map.Entry<String, Object> entry : map.entrySet()) { try {
{
String key = entry.getKey(); String key = entry.getKey();
Object value = entry.getValue(); Object value = entry.getValue();
List<OnlCgformField> fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
//处理发布日期,标准实施日期 //处理发布日期,标准实施日期
//以下注释代码为测试数据(暂时保留)
// if(!"id".equals(key)
// &&!"create_by".equals(key)
// &&!"create_time".equals(key)
// &&!"update_by".equals(key)
// &&!"update_time".equals(key)
// &&!"sys_org_code".equals(key)){
if ("issue_time".equals(key) || "implement_time".equals(key)) { if ("issue_time".equals(key) || "implement_time".equals(key)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (ObjectUtils.isNotEmpty(value)) { if (ObjectUtils.isNotEmpty(value)) {
value = "str_to_date('" + sdf.format(value) + "','%Y-%m-%d %H:%i:%s')"; value = "str_to_date('" + value + "','%Y-%m-%d')";
} }
valuesBuilder.append("," + value); valuesBuilder.append("," + value);
} else { } else {
//处理文件类型 //处理文件类型
List<OnlCgformField> fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); List<OnlCgformField> fieldFile = null;
try {
fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
} catch (Exception e) {
e.printStackTrace();
}
if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) {
String valueTemp = UUID.randomUUID().toString().replace("-", ""); String valueTemp = UUID.randomUUID().toString().replace("-", "");
// value = valueTemp; // value = valueTemp;
//修改文件表关联信息connect_id //修改文件表关联信息connect_id
@@ -288,17 +281,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else { } else {
valuesBuilder.append("," + "'" + value + "'"); valuesBuilder.append("," + "'" + value + "'");
} }
} }
fieldsBuilder.append("," + key); fieldsBuilder.append("," + key);
// }
} }
} catch (Exception e) {
e.printStackTrace();
}
String insertField = mustFields + fieldsBuilder.toString(); String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString(); String insertValue = mustValues + valuesBuilder.toString();
bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue); bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
} }
/** /**
@@ -401,7 +392,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
for (String field : fieldListTemp) { for (String field : fieldListTemp) {
String fieldTemp = null; String fieldTemp = null;
if ("issue_time".equals(field) || "implement_time".equals(field)) { if ("issue_time".equals(field) || "implement_time".equals(field)) {
String fieldNew = "date_format(" + field + ", '%Y-%m-%d %H:%i:%s')"; String fieldNew = "date_format(" + field + ", '%Y-%m-%d')";
fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field; fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
fieldListNew.add(fieldTemp); fieldListNew.add(fieldTemp);
} else { } else {
@@ -417,7 +408,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<Map<String, Object>> mapList = queryCondition("1"); List<Map<String, Object>> mapList = queryCondition("1");
//查询条件处理 //查询条件处理
if (ObjectUtils.isNotEmpty(parameter)) {
for (Map.Entry<String, Object> entry : parameter.entrySet()) { for (Map.Entry<String, Object> entry : parameter.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
String value = (String) entry.getValue(); String value = (String) entry.getValue();
@@ -427,11 +417,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (key.equals(fieldName)) { if (key.equals(fieldName)) {
//字段类型(判断是输入框还是下拉,等等) //字段类型(判断是输入框还是下拉,等等)
String fieldType = (String) map.get("field_show_type");//字段类型 String fieldType = (String) map.get("field_show_type");//字段类型
if (FieldTypeEnum.TEXT.getValue().equals(fieldType)) { if (FieldTypeEnum.TEXT.getValue().equals(fieldType)) {
//输入框 //输入框
conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')"); conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
} else if (FieldTypeEnum.LIST.getValue().equals(fieldType) } else if (FieldTypeEnum.LIST.getValue().equals(fieldType)
|| FieldTypeEnum.LIST_MULTI.getValue().equals(fieldType)) { || FieldTypeEnum.LIST_MULTI.getValue().equals(fieldType)) {
StringBuilder valueSb = new StringBuilder(); StringBuilder valueSb = new StringBuilder();
@@ -463,14 +451,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else if ("2".equals((String) parameter.get("orderBy"))) { } else if ("2".equals((String) parameter.get("orderBy"))) {
conditionSb.append(" desc");//倒序 conditionSb.append(" desc");//倒序
} }
}
} else { } else {
conditionSb.append(" order by create_time desc"); conditionSb.append(" order by create_time desc");
} }
int pageNo = 1; int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
int pageSize = 10; int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
// int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
// int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize); IPage page = new Page(pageNo, pageSize);
IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), conditionSb.toString()); IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), conditionSb.toString());
@@ -496,6 +481,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
/** /**
* 下拉选处理数据字典 * 下拉选处理数据字典
*
* @param sysDictItems * @param sysDictItems
* @param entry * @param entry
* @param collect * @param collect