Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request !54

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java

@@ -16,8 +16,8 @@ import com.adc.da.base.web.BaseController;
 * @since 2021-07-25
 */
 @RestController
-@Api(description = "|SarBussStandPlan|")
+@Api(tags = "福田标准法规--企业标准信息-|SarBussStandPlan|")
-@RequestMapping("/sarBussStandPlan/sar-buss-stand-plan")
+@RequestMapping("/${restPath}/lawss/sarBussStandPlan")
 public class SarBussStandPlanController extends BaseController<SarBussStandPlan> {
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarBussionessStand.controller;
 
 
+import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarResource.service.ITsResourceService;
@@ -40,12 +41,32 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @Autowired
     private ISarBussionessStandService sarBussionessStandEOService;
 
+    @Autowired
+    private IPersonCollectEOService personCollectEOService;
+
     @Autowired
     private ITsResourceService iTsResourceService;
 
+
     @Autowired
     private ITsUserService tsUserService;
 
+    /**
+     * 根据id查询标准详情
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandEO|详情")
+    @GetMapping("/getStandInfoById")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarBussionessStand> getStandInfoById(String id) throws Exception {
+        SarBussionessStand result = sarBussionessStandEOService.selectStandardsInfoByKey(id);
+        String collectId = personCollectEOService.queryCollectByUserAndId(id);
+        result.setCollectId(collectId);
+        return Result.success(result);
+    }
+
     /**
      * 给指定标准配置目录
      * @param standardsInfoEO
@@ -54,7 +75,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @ApiOperation(value = "|SarBussionessStandEO|确认配置标准")
     @PostMapping("/saveStandardsMenu")
     //@RequiresPermissions("lawss:sarBussionessStand:saveStandardsMenu")
-    public ResponseMessage saveStandardsMenu(@RequestBody SarBussionessStandEOPage standardsInfoEO) throws Exception {
+    public ResponseMessage saveStandardsMenu(@RequestBody SarBussionessStandEOPage standardsInfoEO){
         if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) {
             return Result.error("所选节点不支持配置标准");
         } else {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -18,6 +18,8 @@ import java.util.List;
 @Repository
 public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
+    List<SarBussionessStand> selectStandardsInfoByKey(String id);
+
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
 
     int getBussionessStandInfoCount(SarBussionessStandEOPage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {
 
+    SarBussionessStand selectStandardsInfoByKey(String id) throws Exception;
+
     SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO);
 
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -1,5 +1,7 @@
 package com.adc.da.slrs.sarBussionessStand.service.impl;
 
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.common.SelectionTypeEnum;
 import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
@@ -14,6 +16,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.FieldConvertUtil;
 import com.adc.da.utils.util.InitStandAttrUtil;
@@ -23,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Clob;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -42,6 +42,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private ITsUserService tsUserService;
 
+    @Autowired
+    private IAttFileEOService attFileEOService;
+
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+
     @Autowired
     private ITsResourceService iTsResourceService;
 
@@ -57,6 +63,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
 
+    @Override
+    public SarBussionessStand selectStandardsInfoByKey(String id) throws Exception{
+        List<SarBussionessStand> sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id);
+        SarBussionessStand sarBussionessStandEO = new SarBussionessStand();
+        if(!sarBussionessStandlist.isEmpty()) {
+            List<SarBussionessStand> newStandList = new ArrayList<>();
+            newStandList.add(sarBussionessStandlist.get(0));
+            attrInfoShowDetails(newStandList);
+            sarBussionessStandEO = newStandList.get(0);
+        }
+        return sarBussionessStandEO;
+    }
+
+    public void attrInfoShowDetails(List<SarBussionessStand> sarlist) throws Exception {
+        for (SarBussionessStand row : sarlist) {
+            attrInfoDetails(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        if (org.apache.commons.lang3.StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            entry.setValue(fileObj);
+                        }
+                    }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        List<String> valArr = Arrays.asList(value.split(","));
+                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        entry.setValue(value);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
     public SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO) {
         SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();
         String nowMenuId = standardsInfoEO.getMenuId();

adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java

@@ -109,6 +109,7 @@ public class InitStandAttrUtil implements ApplicationRunner {
         StringBuilder fieldInfoNameBuilderBuss = new StringBuilder();
         QueryWrapper qw = new QueryWrapper();
         qw.eq("VALID_FLAG","0");
+        qw.orderByAsc("ORDER_NUM");
         List<SarStandAttrDetails> getDetailsList = sarStandAttrDetailsEOService.list(qw);
         if (getDetailsList != null && !getDetailsList.isEmpty()) {
             logger.info("项目启动时加载--查询标准属性类--查询到" + getDetailsList.size() + "条属性字段数据！");

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java

@@ -5,9 +5,11 @@ import com.adc.da.sys.entity.DicTypeEO;
 import com.adc.da.sys.page.DicTypeEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
 
     public DicTypeEO getDicTypeEOById(String id);