bug53597批量删除加判断+相关人员模板+导入修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java

@@ -129,8 +129,9 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 	@AutoLog(value = "虚拟清单基础表-批量删除")
 	@ApiOperation(value="虚拟清单基础表-批量删除", notes="虚拟清单基础表-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
-		this.dummyInventoryBaseEOService.deleteByIds(Arrays.asList(ids.split(",")));
+								 @RequestParam(name="cut",required=true) String cut) {
+		this.dummyInventoryBaseEOService.deleteByIds(Arrays.asList(ids.split(",")),cut);
 		return Result.OK("批量删除成功!");
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java

@@ -52,7 +52,7 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
 	 * @param ids
 	 * @return
 	 */
-    void deleteByIds(List<String> ids);
+    void deleteByIds(List<String> ids,String cut);
 
 	/**
 	 * 通过id查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.domain.service.DomainUserRelService;
@@ -135,7 +137,16 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
      * @return
      */
     @Override
-    public void deleteByIds(List<String> ids) {
+    public void deleteByIds(List<String> ids,String cut) {
+        List<DummyInventoryBaseEO> records = listByIds(ids);
+        List<String> stateList = records.stream().map(e -> e.getState()).collect(Collectors.toList());
+        if(stateList.contains(InventoryStateEnum.ISSUE.getValue())){
+            if(CutEnum.CN.getValue().equals(cut)){
+                throw new JeroBootException("已发布的虚拟清单,必须先撤回才能删除");
+            }else{
+                throw new JeroBootException("The published virtual inventory must be withdrawn before it can be deleted.");
+            }
+        }
         removeByIds(ids);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -13,6 +14,7 @@ import com.jero.modules.dummy.service.impl.DummyInventoryInfoEOServiceImpl;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.system.entity.SysDictItem;
@@ -25,10 +27,7 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -660,6 +659,16 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			cell.setCellValue(explain);
 			cell.setCellStyle(cellStyleTemp);
 
+			//查标签内容里的责任领域数据
+			List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+			List<String> dataList = dutyTerritory.stream().filter(e->e.getDelFlag()== CommonConstant.DEL_FLAG_0).map(e -> e.getItemText()).collect(Collectors.toList());
+			//设置导出数据
+			if(CollectionUtils.isNotEmpty(dataList)) {
+				for (int j = 2; j < dataList.size()+2; j++) {
+					Row dataRow = sheet.createRow(j);
+					dataRow.createCell(0).setCellValue(dataList.get(j - 2));
+				}
+			}
 			response.setHeader("Content-Disposition",
 					"attachment; filename=\"" + fileOriName + ".xls");
 			response.setContentType("application/force-download");
@@ -811,8 +820,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							}
 						}*/
 
-						String remark = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						//导入的备注为数字,被识别成小数点后一位
-						if(StringUtils.isNotEmpty(row.getCell(4).toString())) {
+						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+						remarkCell.setCellType(CellType.STRING);
+						String remark = remarkCell.toString();
+						if(StringUtils.isNotEmpty(remark)) {
 							projectRelatedPersonnel.setRemark(remark);
 						}