Merge remote-tracking branch 'origin/master'

2022-05-23 15:27:50 +08:00
parent 5a17bbe3c0 9950f86326
commit d59a93ade1
12 changed files with 315 additions and 23 deletions
@@ -60,9 +60,9 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	private java.lang.String sysOrgCode;

 	/**数据字典id*/
-	@Excel(name = "数据字典id", width = 15)
-	@Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
-	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
+//	@Excel(name = "数据字典id", width = 15)
+//	@Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
+	@ApiModelProperty(value = "数据字典id")
 	private java.lang.String sysDictId;

 	/**是否有子节点*/
@@ -104,6 +104,9 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	@TableField(exist = false)
 	private java.lang.String itemValue;

+	@TableField(exist = false)
+	private String cut;
+
 	@Override
 	public int compareTo(SysCategory o) {
 		//比较条件我们定的是按照code的长度升序
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.common.util.oConvertUtils;
@@ -31,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * @Description: 分类字典
@@ -88,6 +90,19 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 		sysCategory.setItemValue(String.valueOf(RandomUtils.nextLong()));
 		sysCategory.setIsTagDict(1);
 		sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0);
+
+		QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("sys_dict_id", sysCategory.getSysDictId()).eq("del_flag",CommonConstant.DEL_FLAG_0);
+		List<SysCategory> sysCategoryList = list(queryWrapper);
+		List<String> sysCategoryNameList = sysCategoryList.stream().map(e -> e.getName()).collect(Collectors.toList());
+		if(sysCategoryNameList.contains(sysCategory.getName())){
+			if(CutEnum.CN.getValue().equals(sysCategory.getCut())) {
+				throw new JeroBootException("名称不能重复!");
+			}else{
+				throw new JeroBootException("The name cannot be duplicate!");
+			}
+		}
+
 		baseMapper.insert(sysCategory);
 	}

@@ -60,6 +60,13 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
     */
    List<Map<String, Object>> queryCondition(String flag, String cut,String searchFlag);

+    /**
+     * 查询条件(法规清单或虚拟清单高级搜索需要的数据)
+     *
+     * @return
+     */
+    List<Map<String, Object>> queryConditionInventory(String flag, String cut);
+
    /**
     * 列表表头
     *
@@ -419,6 +419,62 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
        }
        return list;
    }
+    /**
+     * 查询条件(法规清单或虚拟清单高级搜索需要的数据)
+     *
+     * @param flag
+     * @param cut
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> queryConditionInventory(String flag, String cut) {
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+        //高级搜索中过滤掉编号,标题,状态
+        fieldList = fieldList.stream()
+                .filter(e -> !"serial_number".equals(e.getDbFieldName())
+                        && !"title".equals(e.getDbFieldName())
+                        && !"title_en".equals(e.getDbFieldName())
+                        && !"state".equals(e.getDbFieldName()))
+                .collect(Collectors.toList());
+
+        if (fieldList.size() != 0) {
+            //过滤出搜索条件()
+            fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
+        }
+        //树形数据字典
+        List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree();
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (OnlCgformField onlCgformField : fieldList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("type","");
+            map.put("dictCode","");
+            //判断是输入框还是日期类型
+            String fieldShowType = onlCgformField.getFieldShowType();
+            if(FieldTypeEnum.TEXT_STRING.getValue().equals(fieldShowType)){
+                map.put("type","string");
+            }else if(FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)){
+                map.put("type","date");
+            }else if(FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldShowType) || FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)){
+                map.put("dictCode",onlCgformField.getDictField());
+            }
+            map.put("value",onlCgformField.getDbFieldName());
+            if(CutEnum.CN.getValue().equals(cut)){
+                map.put("text",onlCgformField.getDbFieldTxt());
+            }else{
+                map.put("text",onlCgformField.getDbFieldEnName());
+            }
+
+            if ("technology_territory".equals(onlCgformField.getDbFieldName())) {
+                List<SysCategoryTreeVO> sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> onlCgformField.getDictId().equals(e.getDictId())).collect(Collectors.toList());
+                map.put("tree", sysCategoryTreeVOList);
+            } else {
+                map.put("tree", new ArrayList<>());
+            }
+
+            list.add(map);
+        }
+        return list;
+    }

    /**
     * 列表表头
@@ -5,11 +5,13 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
@@ -26,9 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;


- /**
+/**
 * @Description: 虚拟清单详情表
 * @Author: jero-boot
 * @Date:   2022-04-11
@@ -41,6 +45,8 @@ import java.util.List;
 public class DummyInventoryInfoEOController extends JeroController<DummyInventoryInfoEO, IDummyInventoryInfoEOService> {
 	@Autowired
 	private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
+	@Autowired
+	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;

 	/**
 	 * 分页列表查询
@@ -266,4 +272,29 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor

 	 }

+	/**
+	 * 列表查询条件 标识传 1-->用于查询文档库字段属
+	 * 虚拟清单添加调取文档库时高级搜索条件
+	 * @param flag
+	 * @return
+	 */
+	@AutoLog(value = "虚拟清单添加调取文档库时高级搜索条件")
+	@ApiOperation(value="虚拟清单添加调取文档库时高级搜索条件", notes="虚拟清单添加调取文档库时高级搜索条件")
+	@GetMapping(value = "/queryConditionInventory")
+	public Result<List<Map<String,Object>>> queryConditionInventory(@RequestParam(name="flag",required=true) String flag,
+														   @RequestParam(name="cut",required=true) String cut) {
+		List<Map<String,Object>> list = bussDocumentLibraryEOService.queryConditionInventory(flag,cut);
+		return Result.OK(list);
+	}
+
+	@ApiOperation(value="虚拟清单中添加调用文档库数据--分页", notes="虚拟清单中添加调用文档库数据--分页")
+	@PostMapping(value = "/queryPageDummy")
+	@ResponseBody
+	public JSONObject queryPageDummy(@RequestBody Map<String,Object> parameter) {
+		IPage infoPage = bussDocumentLibraryEOService.getPageDummy(parameter);
+		Result<IPage> ok = Result.OK(infoPage);
+		JSONObject jsonResult = JSONObject.fromObject(ok);
+		return jsonResult;
+	}
+
 }
@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
@@ -377,4 +378,30 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	 	return this.projectLawsInventoryEOService.change(parmas);
 	 }

+	 /**
+	  * 列表查询条件 标识传 1-->用于查询文档库字段属
+	  * 法规清单添加调取文档库时高级搜索条件
+	  * @param flag
+	  * @return
+	  */
+	 @AutoLog(value = "法规清单添加调取文档库时高级搜索条件")
+	 @ApiOperation(value="法规清单添加调取文档库时高级搜索条件", notes="法规清单添加调取文档库时高级搜索条件")
+	 @GetMapping(value = "/queryConditionInventory")
+	 public Result<List<Map<String,Object>>> queryConditionInventory(@RequestParam(name="flag",required=true) String flag,
+																	 @RequestParam(name="cut",required=true) String cut) {
+		 List<Map<String,Object>> list = bussDocumentLibraryEOService.queryConditionInventory(flag,cut);
+		 return Result.OK(list);
+	 }
+
+
+	 @ApiOperation(value="法规清单中添加调用文档库数据--分页", notes="法规清单中添加调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageDummy")
+	 @ResponseBody
+	 public net.sf.json.JSONObject queryPageDummy(@RequestBody Map<String,Object> parameter) {
+		 IPage infoPage = bussDocumentLibraryEOService.getPageDummy(parameter);
+		 Result<IPage> ok = Result.OK(infoPage);
+		 net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok);
+		 return jsonResult;
+	 }
+
 }
@@ -59,10 +59,10 @@
                <!--搜索条件:项目名称,包含%,单独搜索-->
                <choose>
                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        and pni.project_name like '%1%%' escape '1'
+                        and( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                    </when>
                    <otherwise>
-                        and pni.project_name like concat('%',#{params.projectName},'%')
+                        and(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like ('%',#{params.projectName},'%'))
                    </otherwise>
                </choose>
            </if>
@@ -1,6 +1,10 @@
 <template>
    <div class="list-table">
-      <a-table :data-source="tableData" :columns="columns" rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
+      <a-table :data-source="tableData" :scroll="{x: 900}"
+               :columns="columns" rowKey="id"
+               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+               :pagination="false"
+               class="tag-con-table">

        <template slot="action" slot-scope="text, record">
          <a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
@@ -28,34 +32,38 @@
    props:{
      tableData:Array,
      total:Number,
+      queryParams: Object
    },
    data(){
      return{
        // tableData:[],
        selectedRowKeys:[],
        // total:0,
-        queryParams:{
-          pageNo:1,
-          pageSize:10
-        },   //搜索条件
+        // queryParams:{
+        //   pageNo:1,
+        //   pageSize:10
+        // },   //搜索条件
        columns: [
          {
            title: this.$t('name'),
            dataIndex: 'itemText',
            key: 'itemText',
            align: "center",
+            ellipsis: true,
            width: 100,
          },
          {
            title: this.$t('enName'),
            align: "center",
            width: 100,
+            ellipsis: true,
            dataIndex: 'enName',
          },
          {
            title: this.$t('describe'),
            align: "center",
            width: 100,
+            ellipsis: true,
            dataIndex: 'description',
          },
          {
@@ -6,6 +6,7 @@
          :columns="columns"
          :data-source="tabData"
          rowKey="id"
+          :scroll="{x: 900}"
          :pagination="false"
          :loading="loading"
          :rowClassName='setRowClassName'
@@ -50,16 +51,19 @@
            title: this.$t('name'),
            dataIndex: 'name',
            key: 'name',
+            ellipsis: true,
          },
          {
            title: this.$t('enName'),
            dataIndex: 'enName',
            key: 'enName',
+            ellipsis: true,
          },
          {
            title: this.$t('describe'),
            dataIndex: 'description',
            key: 'description',
+            ellipsis: true,
          },
          {
            title: this.$t('operation'),
@@ -55,7 +55,9 @@
        </a-form-model>
      </a-modal>

-      <a-table :data-source="tableData" rowKey="id" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">
+      <a-table :data-source="tableData" rowKey="id" :columns="columns"
+               :scroll="{x: true}"
+               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">

        <template slot="action" slot-scope="text, record">
          <a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
@@ -64,7 +64,7 @@
      <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
        <template slot="title" id="popconfirm">
          <!--     下发收集 -->
-          <div @click="distributionAndCollection" class="operator-text-title">
+          <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">
            <a-icon type="plus"/>
            {{$t('distributionAndCollection')}}
          </div>
@@ -74,12 +74,12 @@
            {{$t('FreezeConfiguration')}}
          </div>
          <!--   同步上报库   -->
-          <div @click="handleAdd" class="operator-text-title">
+          <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title">
            <a-icon type="plus"/>
            {{$t('SynchronousReportLibrary')}}
          </div>
          <!--      强制撤回-->
-          <div @click="compulsoryWithdrawal" class="operator-text-title">
+          <div @click="compulsoryWithdrawaljurisdiction" class="operator-text-title">
            <a-icon type="bulb"/>
            {{$t('CompulsoryWithdrawal')}}
          </div>
@@ -109,7 +109,7 @@
        {{$t('submit')}}
      </div>
 <!--      退回-->
-      <div @click="returnData" class="operator-text">
+      <div @click="returnDataJurisdiction" class="operator-text">
        <a-icon type="plus"/>
        {{$t('sendBack')}}
      </div>
@@ -119,7 +119,7 @@
        {{$t('referenceparameter')}}
      </div>
 <!--      批量删除-->
-      <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
+      <div @click="handleDelJurisdiction" class="operator-text" v-has="'document:deleteBatch'">
        <a-icon type="delete"/>
        {{$t('BatchDelete')}}
      </div>
@@ -304,11 +304,9 @@ export default {
  },
  mounted() {},
  methods:{
-    // 判断是否有权限  认证工程师  待发起收集
-    // 添加 批量删除 下发收集 冻结配置 工程接口人列修改
-    permissionmoAndinitiated() {
-      // 判断是否具有提交权限
-      // 认证工程师
+    // 工程接口人 退回 权限
+    // 仅仅状态为 已提交 可以退回
+    homoJurisdictionReturn() {
      // 定义开关 0为没有权限  1为有权限
      let flag = 1
      if(this.homo) {
@@ -317,7 +315,7 @@ export default {
          this.$message.success(this.$t('selectLeastOne'))
        } else {
          this.selectedRowKeysValue.forEach((item, index) => {
-            if(item.state !== '待发起收集') {
+            if(item.state !== '已提交') {
              flag = 0
            }
          })
@@ -332,6 +330,110 @@ export default {
      }
      return flag
    },
+    // 工程接口人 批量删除 权限
+    // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
+    homoJurisdictionBatchdelete() {
+      // 定义开关 0为没有权限  1为有权限
+      let flag = 1
+      if(this.homo) {
+        if(this.selectedRowKeysValue.length == 0) {
+          flag = 0
+          this.$message.success(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') {
+              flag = 0
+            }
+          })
+          if(flag === 1) {
+            flag = 1
+          } else {
+            this.$message.warning(this.$t('operatethisbutton'))
+          }
+        }
+      }else {
+        this.$message.success(this.$t('operatethisbutton'))
+      }
+      return flag
+    },
+    // 工程接口人 同步上报库 权限
+    // 仅仅状态为 已提交 变更 可以同步上报库
+    homoJurisdictionSynchronousLibrary() {
+      // 定义开关 0为没有权限  1为有权限
+      let flag = 1
+      if(this.homo) {
+        if(this.selectedRowKeysValue.length == 0) {
+          flag = 0
+          this.$message.success(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if(item.state !== '已提交' && item.state !== '变更') {
+              flag = 0
+            }
+          })
+          if(flag === 1) {
+            flag = 1
+          } else {
+            this.$message.warning(this.$t('operatethisbutton'))
+          }
+        }
+      }else {
+        this.$message.success(this.$t('operatethisbutton'))
+      }
+      return flag
+    },
+    // 工程接口人 强制撤回 权限
+    // 仅仅状态为 待工程接口人处理 填写人退回 可以强制撤回
+    homoJurisdictionCompulsoryWithdrawal() {
+      // 定义开关 0为没有权限  1为有权限
+      let flag = 1
+      if(this.homo) {
+        if(this.selectedRowKeysValue.length == 0) {
+          flag = 0
+          this.$message.success(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') {
+              flag = 0
+            }
+          })
+          if(flag === 1) {
+            flag = 1
+          } else {
+            this.$message.warning(this.$t('operatethisbutton'))
+          }
+        }
+      }else {
+        this.$message.success(this.$t('operatethisbutton'))
+      }
+      return flag
+    },
+    // 工程接口人 下发收集 权限
+    // 仅仅状态为 待发起收集 工程接口人退回 变更 可以下发收集
+    // homoJurisdictionDistributionCollection() {
+    //   // 定义开关 0为没有权限  1为有权限
+    //   let flag = 1
+    //   if(this.homo) {
+    //     if(this.selectedRowKeysValue.length == 0) {
+    //       flag = 0
+    //       this.$message.success(this.$t('selectLeastOne'))
+    //     } else {
+    //       this.selectedRowKeysValue.forEach((item, index) => {
+    //         if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') {
+    //           flag = 0
+    //         }
+    //       })
+    //       if(flag === 1) {
+    //         flag = 1
+    //       } else {
+    //         this.$message.warning(this.$t('operatethisbutton'))
+    //       }
+    //     }
+    //   }else {
+    //     this.$message.success(this.$t('operatethisbutton'))
+    //   }
+    //   return flag
+    // },
    LoginUserType(val) {
      val.split(',').forEach((item,index) => {
        if(item === 'homo') {
@@ -430,6 +532,13 @@ export default {
          console.log(error);
        });
    },
+    // 下发收集的权限
+    distributionAndCollectionJurisdiction() {
+      let homoJurisdictionBatchdelete = this.homoJurisdictionBatchdelete()
+      if(homoJurisdictionBatchdelete) {
+        this.distributionAndCollection()
+      }
+    },
    // 下发收集
    distributionAndCollection() {
      let _array = []
@@ -469,6 +578,16 @@ export default {
          console.log(error);
        });
    },
+    handleSynchronousReportLibraryJurisdiction() {
+      let homoJurisdictionSynchronousLibrary = this.homoJurisdictionSynchronousLibrary()
+      if(homoJurisdictionSynchronousLibrary) {
+        this.handleSynchronousReportLibrary()
+      }
+    },
+    // 同步上报库
+    handleSynchronousReportLibrary() {
+      console.log('同步上报库')
+    },
    // 添加
    handleAdd() {
      if(this.homo) {
@@ -511,6 +630,13 @@ export default {
        }
      }
    },
+    returnDataJurisdiction() {
+      // 退回的状态权限
+      let homoJurisdictionReturn = this.homoJurisdictionReturn
+      if (homoJurisdictionReturn) {
+        this.returnData()
+      }
+    },
    // 退回
    returnData() {
      let _array = []
@@ -549,6 +675,12 @@ export default {
          console.log(error);
        });
    },
+    compulsoryWithdrawaljurisdiction() {
+      let homoJurisdictionCompulsoryWithdrawal = this.homoJurisdictionCompulsoryWithdrawal()
+      if(homoJurisdictionCompulsoryWithdrawal) {
+        this.compulsoryWithdrawal()
+      }
+    },
    // 强制撤回
    compulsoryWithdrawal() {
      let _array = []
@@ -636,6 +768,12 @@ export default {
    searchReset() {
      this.$refs.CollectionTabel.getTableListReset()
    },
+    handleDelJurisdiction() {
+      let homoJurisdictionBatchdelete = this.homoJurisdictionBatchdelete()
+      if(homoJurisdictionBatchdelete) {
+        this.handleDel()
+      }
+    },
    handleDel(){
        let param={
          ids: this.selectedRowKeysArray
@@ -53,6 +53,7 @@
            ref="table"
            rowKey="id"
            size="middle"
+            :scroll="{x: 900}"
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"