用印调整

jeeplus-api/jeeplus-system-api/jeeplus-system-api.iml

@@ -4,6 +4,11 @@
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/DictApiFallbackFactory.java

@@ -1,6 +1,8 @@
 package com.jeeplus.sys.factory;
 
+import com.jeeplus.sys.domain.DictValue;
 import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.service.dto.DictValueDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
@@ -35,6 +37,11 @@ public class DictApiFallbackFactory implements FallbackFactory <IDictApi> {
             public String getDictMap(String dict) {
                 return null;
             }
+
+            @Override
+            public DictValue queryDictValue(String dictValueId) {
+                return null;
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IDictApi.java

@@ -1,7 +1,9 @@
 package com.jeeplus.sys.feign;
 
 import com.jeeplus.common.constant.AppNameConstants;
+import com.jeeplus.sys.domain.DictValue;
 import com.jeeplus.sys.factory.DictApiFallbackFactory;
+import com.jeeplus.sys.service.dto.DictValueDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,4 +39,12 @@ public interface IDictApi {
      */
     @GetMapping(value = "/feign/sys/dict/getDictMap")
     String getDictMap(@RequestParam(value = "dict") String dict);
+
+    /**
+     * 根据id获取字典
+     * @param dictValueId
+     * @return
+     */
+    @GetMapping(value ="/feign/sys/dict/queryDictValue")
+    DictValue queryDictValue(@RequestParam(value = "id")String dictValueId);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/mapper/KnowledgeShareDetailMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.knowledge.domain.KnowledgeShareDetail;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareListDto;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Param;
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/service/KnowledgeShareInfoService.java

@@ -22,16 +22,14 @@ import com.jeeplus.business.knowledge.mapper.KnowledgeShareVisitMapper;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareInfoDto;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareListDto;
 import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.core.service.dto.BaseDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
-import com.jeeplus.sys.utils.UserUtils;
+
 
 import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
@@ -80,7 +78,7 @@ public class KnowledgeShareInfoService {
 
     public String add(KnowledgeShareInfoDto dto) {
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         // 保存知识分享详情信息
@@ -129,7 +127,8 @@ public class KnowledgeShareInfoService {
 
     public String update(KnowledgeShareInfoDto dto) {
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+
         // 保存知识分享详情信息
         KnowledgeShareDetail detail = new KnowledgeShareDetail();
         BeanUtils.copyProperties(dto, detail);
@@ -174,7 +173,7 @@ public class KnowledgeShareInfoService {
     public KnowledgeShareInfoDto findById(String id, String method, Integer size) {
         KnowledgeShareInfoDto dto = new KnowledgeShareInfoDto();
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         if ("view".equals(method)) {
             // 保存访问信息
             saveVisit(id, userDTO);
@@ -212,7 +211,7 @@ public class KnowledgeShareInfoService {
         List<KnowledgeShareVisit> visits = visitMapper.selectByDetailId(size,id);
         if (CollectionUtils.isNotEmpty(visits)) {
             visits.stream().forEach(i -> {
-                UserDTO visitUser = UserUtils.get(i.getUserId());
+                UserDTO visitUser = SpringUtil.getBean(IUserApi.class).getById(i.getUserId());
                 i.setUserId(visitUser.getName());
             });
         }
@@ -227,7 +226,7 @@ public class KnowledgeShareInfoService {
         List<KnowledgeShareComment> comments = commentMapper.selectList(commentWrapper);
         if (CollectionUtils.isNotEmpty(comments)) {
             comments.stream().forEach(i -> {
-                UserDTO commentUser = UserUtils.get(i.getUserId());
+                UserDTO commentUser = SpringUtil.getBean(IUserApi.class).getById(i.getUserId());
                 i.setUserId(commentUser.getName());
                 i.setDeff(timeDef(i.getCreateTime()));
             });
@@ -262,7 +261,7 @@ public class KnowledgeShareInfoService {
 
     public String addComment(KnowledgeShareComment comment) {
         // 获取当前登录人
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         comment.setId(id);

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/service/TypeService.java

@@ -1,13 +1,15 @@
 package com.jeeplus.business.knowledge.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.knowledge.domain.KnowledgeShareType;
 import com.jeeplus.business.knowledge.mapper.KnowledgeShareTypeMapper;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareTypeDto;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -41,7 +43,7 @@ public class TypeService {
 
     public Boolean update(KnowledgeShareType type) {
         // 获取当前登录人
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         type.setUpdateById(userDTO.getId());
         type.setUpdateTime(new Date());
         mapper.updateById(type);
@@ -50,7 +52,7 @@ public class TypeService {
 
     public Boolean add(KnowledgeShareType type) {
         // 获取当前登录人
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         type.setId(id);

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/service/dto/KnowledgeShareInfoDto.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.business.editor.service.dto.EditorFilesDTO;
 import com.jeeplus.business.knowledge.domain.KnowledgeShareComment;
 import com.jeeplus.business.knowledge.domain.KnowledgeShareVisit;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/controller/JyProjectController.java

@@ -3,8 +3,11 @@ package com.jeeplus.business.project.controller;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
-//import com.jeeplus.assess.utils.FreemarkerUtil;
+import com.jeeplus.business.program.configuration.projectDict.domain.vo.FileDictVo;
+import com.jeeplus.business.program.configuration.projectDict.service.ProjectDictService;
+import com.jeeplus.business.program.configuration.projectDict.service.dto.ProjectDictDto;
 import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.domain.JyProjectAudit;
 import com.jeeplus.business.project.domain.JyProjectReportsSubmit;
@@ -19,6 +22,7 @@ import com.jeeplus.business.workContractInfo.service.dto.JyWorkContractInfoDto;
 
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.utils.StringUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import io.swagger.annotations.Api;
@@ -43,6 +47,8 @@ public class JyProjectController {
 
     @Resource
     private JyProjectService jyProjectService;
+    @Resource
+    private ProjectDictService projectDictService;
 
 
     /**
@@ -289,6 +295,31 @@ public class JyProjectController {
     }
 
     /**
+     * 根据项目id查询外审附件信息(归档)
+     */
+    @ApiOperation(value = "根据项目id查询外审附件信息")
+    @GetMapping(value = "/getAttachmentList")
+    public ResponseEntity<List<FileDictVo>> getAttachmentList(@RequestParam String projectId){
+        //根据项目id查询项目信息
+        JyProjectDTO project = jyProjectService.findById(projectId);
+        ProjectDictDto projectDictDto = new ProjectDictDto();
+        List<String> sortList = Lists.newArrayList();
+        sortList.add("12");
+        sortList.add("13");
+        if(StringUtils.isNotBlank(project.getContractTypeFirstValue())){
+            if(project.getContractTypeFirstValue().equals("2")){
+                sortList.add("11");
+            }
+            projectDictDto.setAttachmentProjectType(project.getContractTypeFirstValue());
+        }else{
+            projectDictDto.setAttachmentProjectType("5");
+        }
+        projectDictDto.setSortList(sortList);
+        List<FileDictVo> list = projectDictService.getFileDictList(projectDictDto,projectId);
+        return ResponseEntity.ok(list);
+    }
+
+    /**
      * 新增/修改外审
      */
     @ApiOperation(value = "新增/修改外审")

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/domain/JyProject.java

@@ -171,6 +171,8 @@ public class JyProject extends BaseEntity implements Serializable {
     private String contractType;
     @TableField(exist = false)
     private String contractTypeFirst;
+    @TableField(exist = false)
+    private String contractTypeFirstValue;
 
     /**
      * 联系人

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/JyProjectOutinstanceMapper.java

@@ -18,4 +18,12 @@ public interface JyProjectOutinstanceMapper extends BaseMapper<JyProjectOutinsta
     JyProjectOutinstance findByProjectId(@Param("projectId") String s);
 
     void updateOutInstanceStatus(@Param("id") String id,@Param("status") String status,@Param("exceedTimeStatus") String exceedTimeStatus);
+
+    /**
+     * 根据文件attachmentId 和moduleType 查询附件信息
+     * @param attachmentId
+     * @param moduleType
+     * @return
+     */
+    List<WorkAttachmentInfoDTO> getFileListByAttachmentAndModuleType(@Param("attachmentId")String attachmentId , @Param("moduleType")String moduleType);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/JyProjectOutinstanceMapper.xml

@@ -48,7 +48,32 @@
         update jy_project_outinstance set status=#{status},exceed_time_status=#{exceedTimeStatus} where id=#{id}
     </update>
 
-
+    <select id="getFileListByAttachmentAndModuleType" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
+        select
+            wa.id,
+			wa.url,
+			wa.attachment_name AS `name`,
+			wa.create_by_id AS `createBy.id`,
+			su.name AS `createBy.name`,
+			wa.create_time,
+            wa.type as "type",
+            wa.attachment_id as "attachmentId",
+            wa.attachment_name as "attachmentName",
+            wa.attachment_flag as "attachmentFlag",
+            wa.module_type as "moduleType",
+            wa.attachment_type as "attachmentType",
+            wa.file_size as "fileSize",
+            wa.sort as "sort",
+            wa.description as "description"
+		from
+		    work_attachment wa
+		left join sys_user su on su.id = wa.create_by_id
+		<where>
+            wa.del_flag = 0
+            AND wa.attachment_id = #{attachmentId}
+            AND wa.module_type = #{moduleType}
+        </where>
+    </select>
 
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -186,6 +186,9 @@
            (SELECT dv.label FROM `sys_dict_value` dv
 			LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id
 			where dt.type='jy_contract_type_up' and wci.contract_type_first=dv.value) as contractTypeFirst,
+           (SELECT dv.value FROM `sys_dict_value` dv
+			LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id
+			where dt.type='jy_contract_type_up' and wci.contract_type_first=dv.value) as contractTypeFirstValue,
 			cl.id as linkId,
 			cl.name as clientName,
 			cl.link_phone as phone,

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -38,7 +38,6 @@ import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
-import com.jeeplus.sys.utils.DictUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -1497,8 +1496,7 @@ public class JyProjectService {
     /**
      * 修改附件信息
      * @param list 待修改的附件列表
-     * @param userDTO 当前登录用户
-     * @param id 关联id
+     * @param userDTO 当前登录用户     * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateReportsFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/dto/JyProjectDTO.java

@@ -175,6 +175,8 @@ public class JyProjectDTO extends BaseEntity implements Serializable {
     private String contractType;
     @TableField(exist = false)
     private String contractTypeFirst;
+    @TableField(exist = false)
+    private String contractTypeFirstValue;
 
     @TableField(exist = false)
     private String place;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/service/SignetService.java

@@ -21,13 +21,13 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.business.useSeal.domain.Signet;
 import com.jeeplus.business.useSeal.mapper.SignetMapper;
 import com.jeeplus.business.useSeal.service.dto.SignetDTO;
+import com.jeeplus.sys.domain.DictValue;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -180,8 +180,7 @@ public class SignetService {
         }
         signet.setProjectId(projectId);
         signet.setProjectName(projectName);
-        List<DictValueDTO> projectType = DictUtils.getDictDTOList("jy_signet_project_type");
-
+        DictValue dictValue = SpringUtil.getBean(IDictApi.class).queryDictValue(dto.getTypes().get(1));
         //保存用印类型
         if (null != dto.getTypes()&&dto.getTypes().size()>0){
             if (dto.getTypes().size()==1){
@@ -190,14 +189,12 @@ public class SignetService {
                 signet.setFirstType(dto.getTypes().get(0));
                 signet.setType(dto.getTypes().get(1));
                 //修改类型状态 1:报告  2:报批
-                projectType.stream().forEach(item->{
-                    if (dto.getTypes().get(1).equals(item.getId()) && item.getLabel().equals("报告签发")){
+                    if (dto.getTypes().get(1).equals(dictValue.getId()) && dictValue.getLabel().equals("报告签发")){
                         signet.setTypeStatus("1");
                     }
-                    if (dto.getTypes().get(1).equals(item.getId()) && item.getLabel().equals("报批签发")){
+                    if (dto.getTypes().get(1).equals(dictValue.getId()) && dictValue.getLabel().equals("报批签发")){
                         signet.setTypeStatus("2");
                     }
-                });
 
             }
         }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/DictApiImpl.java

@@ -1,13 +1,20 @@
 package com.jeeplus.sys.feign;
 
 import com.alibaba.fastjson.JSON;
+import com.jeeplus.sys.domain.DictValue;
+import com.jeeplus.sys.service.DictTypeService;
+import com.jeeplus.sys.service.DictValueService;
+import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.utils.DictUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
 public class DictApiImpl implements IDictApi {
+    @Autowired
+    private DictValueService dictValueService;
 
 
     @Override
@@ -24,4 +31,10 @@ public class DictApiImpl implements IDictApi {
     public String getDictMap(String dict) {
         return JSON.toJSONString(DictUtils.getDictMap().get(dict));
     }
+
+    @Override
+    public DictValue queryDictValue(String dictValueId) {
+        DictValue dictValue = dictValueService.findById(dictValueId);
+        return dictValue;
+    }
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/DictValueMapper.java

@@ -5,6 +5,8 @@ package com.jeeplus.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.sys.domain.DictValue;
+import com.jeeplus.sys.service.dto.DictValueDTO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 数据字典MAPPER接口
@@ -14,4 +16,5 @@ import com.jeeplus.sys.domain.DictValue;
  */
 public interface DictValueMapper extends BaseMapper <DictValue> {
 
+    DictValue findById(@Param("id") String id);
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/DictValueMapper.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.sys.mapper.DictValueMapper">
-
+    <select id="findById" resultType="com.jeeplus.sys.domain.DictValue">
+        select
+            label,
+            id
+        from
+            sys_dict_value
+        where id=#{id}
+    </select>
 
 </mapper>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/DictValueService.java

@@ -6,6 +6,8 @@ package com.jeeplus.sys.service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.sys.domain.DictValue;
 import com.jeeplus.sys.mapper.DictValueMapper;
+import com.jeeplus.sys.service.dto.DictValueDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -18,6 +20,13 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional
 public class DictValueService extends ServiceImpl <DictValueMapper, DictValue> {
+    @Autowired
+    private DictValueMapper dictValueMapper;
+
+    public DictValue findById(String id){
+        DictValue dictValueDTO=dictValueMapper.findById(id);
+        return dictValueDTO;
+    }
 
 }