完善市场法规库清单详情

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java

@@ -126,7 +126,6 @@ public class LawsMarketStandardDetail implements Serializable {
      * 国家
      */
     @Excel(name = "国家/地区", width = 15,dicCode = "market_state")
-    @TableField(exist = false)
     @ApiModelProperty(value = "国家")
     private String country;
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -5,12 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.oConvertUtils;
 import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
@@ -18,14 +15,10 @@ import com.jero.modules.laws.marketStandard.entity.MarketStandardDetailVO;
 import com.jero.modules.laws.marketStandard.mapper.LawsMarketStandardMapper;
 import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
 import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
-import com.jero.modules.sys.entity.LawsWorkingGroupUserImport;
-import com.jero.modules.system.entity.SysDict;
-import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -36,16 +29,16 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -103,13 +96,15 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = JeroBootException.class)
     public synchronized void add(MarketStandardDetailVO marketStandardDetailVO) {
         LawsMarketStandard manifest = marketStandardDetailVO.getManifest();
         manifest.setManifestStatus(MarketStandardConstants.MANIFEST_STATUS_NOT_PUBLISH);
         // 设置清单编号
         manifest.setManifestNo(this.generateManifestNo(manifest.getCountry()));
         manifest.setManifestVersion("V1.0");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        manifest.setAuthor(sysUser.getId());
         save(manifest);
         List<LawsMarketStandardDetail> lists = marketStandardDetailVO.getLists();
         lists.forEach(e -> e.setManifestId(manifest.getId()));