文档库-阶段实施详情开发对接。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java

@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class PhasedImplementationDetailsEOController extends JeroController<PhasedImplementationDetailsEO, IPhasedImplementationDetailsEOService> {
 	@Autowired
 	private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -51,10 +51,12 @@ public class PhasedImplementationDetailsEOController extends JeroController<Phas
 	public Result<?> queryPageList(PhasedImplementationDetailsEO phasedImplementationDetailsEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<PhasedImplementationDetailsEO> queryWrapper = QueryGenerator.initQueryWrapper(phasedImplementationDetailsEO, req.getParameterMap());
 		Page<PhasedImplementationDetailsEO> page = new Page<PhasedImplementationDetailsEO>(pageNo, pageSize);
 		IPage<PhasedImplementationDetailsEO> pageList = phasedImplementationDetailsEOService.page(page, queryWrapper);
+		this.phasedImplementationDetailsEOService.disposeData(pageList.getRecords(),cut);
 		return Result.OK(pageList);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -74,6 +75,10 @@ public class PhasedImplementationDetailsEO implements Serializable {
     @ApiModelProperty(value = "实施类型")
     private String implementationType;
 
+	/**实施类型展示文本**/
+	@TableField(exist = false)
+    private String implementationTypeText;
+
 	/**实施日期*/
 	@Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java

@@ -60,4 +60,6 @@ public interface IPhasedImplementationDetailsEOService extends IService<PhasedIm
     List<PhasedImplementationDetailsEO> queryList();
 
 	boolean insertBatch(List<PhasedImplementationDetailsEO> phasedImplDetailsEOList);
+
+	void disposeData(List<PhasedImplementationDetailsEO> datas, String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -902,6 +902,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         QueryWrapper<PhasedImplementationDetailsEO> phasedImplDetailsQueryWrap = new QueryWrapper<>();
         phasedImplDetailsQueryWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,id);
         List<PhasedImplementationDetailsEO> phasedImplementationDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap);
+        this.phasedImplementationDetailsEOService.disposeData(phasedImplementationDetailsEOList,cut);
         dataList.get(0).put("phasedImplementationDetailsEOList",phasedImplementationDetailsEOList);
 
         return dataList;
@@ -2331,8 +2332,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String title = StringUtils.valueOf(map.get("title"));
         String titleEn = StringUtils.valueOf(map.get("title_en"));
 
-        // 批量添加分阶段实施明细信息
-        List<PhasedImplementationDetailsEO> phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map);
 
         //通过id查询数据
         List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
@@ -2643,6 +2642,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //删除文档库数据
         bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
         bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
+
+        // 批量添加分阶段实施明细信息
+        List<PhasedImplementationDetailsEO> phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map);
+
         map.put("module_type", "文档库");
         map.put("module_type_flag", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue());
         map.put("create_time", new Date());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java

@@ -1,13 +1,20 @@
 package com.jero.modules.document.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
+import com.jero.modules.document.enums.ImplementationTypeEnum;
 import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper;
 import com.jero.modules.document.service.IPhasedImplementationDetailsEOService;
+import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -108,4 +115,41 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl<Phased
 		}
 		return flag;
 	}
+
+	@Override
+	public void disposeData(List<PhasedImplementationDetailsEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (PhasedImplementationDetailsEO data : datas) {
+				String implementationType = data.getImplementationType();
+				if(StringUtils.isNotEmpty(implementationType)){
+					String[] implementationTypeArr = implementationType.split(",");
+					ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values();
+
+					String implementationTypeText = "";
+					if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
+						implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> {
+							boolean flag = false;
+							for (String type : implementationTypeArr) {
+								if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) {
+									flag = true;
+								}
+							}
+							return flag;
+						}).map(ImplementationTypeEnum::getNameCn).collect(Collectors.joining(","));
+					}else {
+						implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> {
+							boolean flag = false;
+							for (String type : implementationTypeArr) {
+								if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) {
+									flag = true;
+								}
+							}
+							return flag;
+						}).map(ImplementationTypeEnum::getNameEn).collect(Collectors.joining(","));
+					}
+					data.setImplementationTypeText(implementationTypeText);
+				}
+			}
+		}
+	}
 }