diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java
index 161eeef8..0b2fdcfb 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java
@@ -1,5 +1,9 @@
package com.jero.config.shiro.filters;
+import cn.hutool.core.util.StrUtil;
+import com.jero.common.system.util.JwtUtil;
+import com.jero.common.util.AuthenticationUtils;
+import com.jero.common.util.SpringContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
@@ -9,6 +13,7 @@ import com.jero.config.shiro.JwtToken;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.RequestMethod;
+import javax.annotation.Resource;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
@@ -28,6 +33,8 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
public JwtFilter(boolean allowOrigin){
this.allowOrigin = allowOrigin;
}
+ @Resource
+ private AuthenticationUtils authenticationUtils;
/**
* 执行登录认证
@@ -58,12 +65,21 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
if(token == null){
token = httpServletRequest.getParameter("token");
}
- // update-end--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数
+ String pushToken = httpServletRequest.getParameter("pushToken");
+ if (StrUtil.isNotBlank(pushToken)){
+ String publicKey = httpServletRequest.getParameter("publicKey");
+ if (authenticationUtils ==null ){
+ authenticationUtils = (AuthenticationUtils) SpringContextUtil.getBean("authenticationUtils");
+ }
+ authenticationUtils.check(pushToken,publicKey);
+ }else {
+ // update-end--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数
- JwtToken jwtToken = new JwtToken(token);
- // 提交给realm进行登入，如果错误他会抛出异常并被捕获
- getSubject(request, response).login(jwtToken);
- // 如果没有抛出异常则代表登入成功，返回true
+ JwtToken jwtToken = new JwtToken(token);
+ // 提交给realm进行登入，如果错误他会抛出异常并被捕获
+ getSubject(request, response).login(jwtToken);
+ // 如果没有抛出异常则代表登入成功，返回true
+ }
return true;
}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml
index 27820cc2..86b1ec89 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml
@@ -55,9 +55,9 @@
AND company_id = #{companyId}
-
-
-
+
+ AND liaison_man_id = #{contactsId}
+
) project
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 924125c6..52b0e2d8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -328,26 +328,29 @@ public class PayMeetingController extends JeroController idList = Arrays.asList(fileIds.split(","));
- List ossFiles = iossFileService.listByIds(idList);
- for (OSSFile ossFile : ossFiles) {
- String url = ossFile.getUrl();
- String[] fileUrl = url.split("/");
- int length = fileUrl.length;
- ossFile.setFileName(fileUrl[length - 1]);
+ PayMeeting payMeeting = payMeetingService.getById(id);
+ if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))){
+ List idList = Arrays.asList(fileIds.split(","));
+ List ossFiles = iossFileService.listByIds(idList);
+ for (OSSFile ossFile : ossFiles) {
+ String url = ossFile.getUrl();
+ String[] fileUrl = url.split("/");
+ int length = fileUrl.length;
+ ossFile.setFileName(fileUrl[length - 1]);
+ }
+ Map stringStringMap = AuthenticationUtils.encryptByRsaPriKey();
+ String publicKey = stringStringMap.get("publicKey");
+ String token = stringStringMap.get("token");
+ String jsonString1 = JSONObject.toJSONString(ossFiles);
+ String post = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/addStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString1);
+ AuthenticationUtils.checkResult(post);
+ StableCrossTraining stableCrossTraining = new StableCrossTraining();
+ stableCrossTraining.setId(id);
+ stableCrossTraining.setMeetingFiles(fileIds);
+ String jsonString = JSONObject.toJSONString(stableCrossTraining);
+ String post1 = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/updateStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString);
+ AuthenticationUtils.checkResult(post1);
}
- Map stringStringMap = AuthenticationUtils.encryptByRsaPriKey();
- String publicKey = stringStringMap.get("publicKey");
- String token = stringStringMap.get("token");
- String jsonString1 = JSONObject.toJSONString(ossFiles);
- String post = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/addStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString1);
- AuthenticationUtils.checkResult(post);
- StableCrossTraining stableCrossTraining = new StableCrossTraining();
- stableCrossTraining.setId(id);
- stableCrossTraining.setMeetingFiles(fileIds);
- String jsonString = JSONObject.toJSONString(stableCrossTraining);
- String post1 = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/updateStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString);
- AuthenticationUtils.checkResult(post1);
return Result.OK("上传资料成功!");
}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
new file mode 100644
index 00000000..08b18f2b
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
@@ -0,0 +1,230 @@
+package com.jero.project.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.util.ValidUtil;
+import com.jero.common.util.oConvertUtils;
+import com.jero.project.entity.PayWorkingGroupDataFile;
+import com.jero.project.service.IPayWorkingGroupDataFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 资料维护
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Api(tags="资料维护")
+@RestController
+@RequestMapping("/project/payWorkingGroupDataFile")
+@Slf4j
+public class PayWorkingGroupDataFileController extends JeroController {
+ @Autowired
+ private IPayWorkingGroupDataFileService payWorkingGroupDataFileService;
+ @Autowired
+ private Environment env;
+
+ /**
+ * 分页列表查询
+ *
+ * @param payWorkingGroupDataFile
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "资料维护-分页列表查询")
+ @ApiOperation(value="资料维护-分页列表查询", notes="资料维护-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(PayWorkingGroupDataFile payWorkingGroupDataFile,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ if(StringUtils.isBlank(payWorkingGroupDataFile.getWorkingGroupId())){
+ return Result.error("工作组id不能为空！");
+ }
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 上传
+ *
+ * @param payWorkingGroupDataFile
+ * @return
+ */
+ @AutoLog(value = "资料维护-上传")
+ @ApiOperation(value="资料维护-上传", notes="资料维护-上传")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) {
+ if(StringUtils.isBlank(payWorkingGroupDataFile.getWorkingGroupId())){
+ return Result.error("工作组id不能为空!");
+ }
+ if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
+ return Result.error("文件不能为空!");
+ }
+ List list = new ArrayList<>();
+ String[] s = payWorkingGroupDataFile.getFileIds().split(",");
+ for (String s1 : s) {
+ if(StringUtils.isBlank(s1)){
+ return Result.error("id不能为空!");
+ }
+ PayWorkingGroupDataFile payWorkingGroupDataFileNew = new PayWorkingGroupDataFile();
+ payWorkingGroupDataFileNew.setWorkingGroupId(payWorkingGroupDataFile.getWorkingGroupId());
+ payWorkingGroupDataFileNew.setFileId(s1);
+ list.add(payWorkingGroupDataFileNew);
+ }
+ if(!CollectionUtils.isEmpty(list)){
+ payWorkingGroupDataFileService.saveBatch(list);
+ }
+ return Result.OK("上传成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param payWorkingGroupDataFile
+ * @return
+ */
+ @AutoLog(value = "资料维护-编辑")
+// @ApiOperation(value="资料维护-编辑", notes="资料维护-编辑")
+ @PostMapping(value = "/edit")
+ public Result edit(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) {
+ StringBuilder msg = ValidUtil.validateAll(payWorkingGroupDataFile);
+ if(!StringUtils.isBlank(msg)){
+ throw new JeroBootException(msg.toString());
+ }
+ payWorkingGroupDataFileService.updateById(payWorkingGroupDataFile);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "资料维护-通过id删除")
+ @ApiOperation(value="资料维护-通过id删除", notes="资料维护-通过id删除")
+ @GetMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id") String id) {
+ if(StringUtils.isBlank(id)){
+ return Result.error("id不能为空!");
+ }
+ payWorkingGroupDataFileService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "资料维护-批量删除")
+ @ApiOperation(value="资料维护-批量删除", notes="资料维护-批量删除")
+ @GetMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids") String ids) {
+ if(StringUtils.isBlank(ids)){
+ return Result.error("id不能为空!");
+ }
+ String[] s = ids.split(",");
+ for (String s1 : s) {
+ if(StringUtils.isBlank(s1)){
+ return Result.error("id不能为空!");
+ }
+ }
+ this.payWorkingGroupDataFileService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "资料维护-通过id查询")
+ @ApiOperation(value="资料维护-通过id查询", notes="资料维护-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id") String id) {
+ PayWorkingGroupDataFile payWorkingGroupDataFile = payWorkingGroupDataFileService.getById(id);
+ if(payWorkingGroupDataFile==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(payWorkingGroupDataFile);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param payWorkingGroupDataFile
+ */
+ @AutoLog(value = "资料维护-导出excel")
+ @ApiOperation(value="资料维护-导出excel", notes="资料维护-导出excel")
+ @GetMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupDataFile payWorkingGroupDataFile) {
+ // 过滤选中数据
+ String workingGroupId = request.getParameter("workingGroupId");
+ // Step.2 获取导出数据
+ List pageList = payWorkingGroupDataFileService.queryList(payWorkingGroupDataFile.getWorkingGroupId());
+ List exportList = null;
+
+ // 过滤选中数据
+ String selections = request.getParameter("selections");
+ if (oConvertUtils.isNotEmpty(selections)) {
+ List selectionList = Arrays.asList(selections.split(","));
+ exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ } else {
+ exportList = pageList;
+ }
+
+ // Step.3 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.FILE_NAME, "资料维护"); //此处设置的filename无效 ,前端会重更新设置一下
+ mv.addObject(NormalExcelConstants.CLASS, PayWorkingGroupDataFile.class);
+ //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+ ExportParams exportParams=new ExportParams("资料维护", "资料维护");
+ exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
+ //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+ mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, PayWorkingGroupDataFile.class);
+ }
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
new file mode 100644
index 00000000..5cceb495
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
@@ -0,0 +1,160 @@
+package com.jero.project.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 资料分发
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Api(tags="资料分发")
+@RestController
+@RequestMapping("/project/payWorkingGroupDistributionRecord")
+@Slf4j
+public class PayWorkingGroupDistributionRecordController extends JeroController {
+ @Autowired
+ private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param payWorkingGroupDistributionRecord
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+// @AutoLog(value = "资料分发-分页列表查询")
+// @ApiOperation(value="资料分发-分页列表查询", notes="资料分发-分页列表查询")
+// @GetMapping(value = "/list")
+ public Result queryPageList(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDistributionRecord, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = payWorkingGroupDistributionRecordService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 分发
+ *
+ * @param payWorkingGroupDistributionRecord
+ * @return
+ */
+ @AutoLog(value = "资料分发-分发")
+ @ApiOperation(value="资料分发-分发", notes="资料分发-分发")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
+
+// EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
+// emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileList);
+
+ payWorkingGroupDistributionRecordService.save(payWorkingGroupDistributionRecord);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param payWorkingGroupDistributionRecord
+ * @return
+ */
+// @AutoLog(value = "资料分发-编辑")
+// @ApiOperation(value="资料分发-编辑", notes="资料分发-编辑")
+// @PutMapping(value = "/edit")
+ public Result edit(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
+ payWorkingGroupDistributionRecordService.updateById(payWorkingGroupDistributionRecord);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+// @AutoLog(value = "资料分发-通过id删除")
+// @ApiOperation(value="资料分发-通过id删除", notes="资料分发-通过id删除")
+// @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id") String id) {
+ payWorkingGroupDistributionRecordService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+// @AutoLog(value = "资料分发-批量删除")
+// @ApiOperation(value="资料分发-批量删除", notes="资料分发-批量删除")
+// @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids") String ids) {
+ this.payWorkingGroupDistributionRecordService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+// @AutoLog(value = "资料分发-通过id查询")
+// @ApiOperation(value="资料分发-通过id查询", notes="资料分发-通过id查询")
+// @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id") String id) {
+ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.getById(id);
+ if(payWorkingGroupDistributionRecord==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(payWorkingGroupDistributionRecord);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param payWorkingGroupDistributionRecord
+ */
+// @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
+ return super.exportXls(request, payWorkingGroupDistributionRecord, PayWorkingGroupDistributionRecord.class, "pay_working_group_distribution_record");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, PayWorkingGroupDistributionRecord.class);
+ }
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java
new file mode 100644
index 00000000..3b2473ed
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java
@@ -0,0 +1,87 @@
+package com.jero.project.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * @Description: pay_working_group_data_file
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_working_group_data_file")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_working_group_data_file对象", description="pay_working_group_data_file")
+public class PayWorkingGroupDataFile implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**工作组id*/
+// @Excel(name = "工作组id", width = 15)
+ @ApiModelProperty(value = "工作组id")
+ @NotEmpty(message = "工作组id不能为空！")
+ @Size(max = 32,message = "工作组id长度不能大于32个字符")
+ private java.lang.String workingGroupId;
+ /**文件id*/
+// @Excel(name = "文件id", width = 15)
+ @ApiModelProperty(value = "文件id")
+ @NotEmpty(message = "文件id不能为空！")
+ @Size(max = 32,message = "文件id长度不能大于32个字符")
+ private java.lang.String fileId;
+ /**
+ * 文件名称
+ */
+ @Excel(name = "文件名称", width = 15)
+ @TableField(exist = false)
+ @ApiModelProperty(value = "文件名称")
+ private String fileName;
+ /**
+ * 下载次数
+ */
+ @Excel(name = "下载次数", width = 15)
+ @TableField(exist = false)
+ @ApiModelProperty(value = "下载次数")
+ private Integer downloadCount;
+ /**创建人*/
+ @Excel(name = "上传人", width = 15)
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建时间*/
+ @Excel(name = "上传时间", width = 15,exportFormat = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新时间")
+ private java.util.Date updateTime;
+
+ /**上传使用 文件ids,多个以逗号分隔*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "上传使用 文件ids,多个以逗号分隔")
+ private java.lang.String fileIds;
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
new file mode 100644
index 00000000..a99422f6
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
@@ -0,0 +1,70 @@
+package com.jero.project.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_working_group_distribution_record
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_working_group_distribution_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_working_group_distribution_record对象", description="pay_working_group_distribution_record")
+public class PayWorkingGroupDistributionRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**资料id*/
+ @Excel(name = "资料id", width = 15)
+ @ApiModelProperty(value = "资料id")
+ private java.lang.String dataId;
+ /**工作组成员id*/
+ @Excel(name = "工作组成员id", width = 15)
+ @ApiModelProperty(value = "工作组成员id")
+ private java.lang.String projectId;
+ /**文件id*/
+ @Excel(name = "文件id", width = 15)
+ @ApiModelProperty(value = "文件id")
+ private java.lang.String fileId;
+ /**联系人id*/
+ @Excel(name = "联系人id", width = 15)
+ @ApiModelProperty(value = "联系人id")
+ private java.lang.String contactsId;
+ /**联系人名称*/
+ @Excel(name = "联系人名称", width = 15)
+ @ApiModelProperty(value = "联系人名称")
+ private java.lang.String contactsName;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新时间")
+ private java.util.Date updateTime;
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java
new file mode 100644
index 00000000..540dc77e
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java
@@ -0,0 +1,38 @@
+package com.jero.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.project.entity.PayWorkingGroupDataFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description: pay_working_group_data_file
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+public interface PayWorkingGroupDataFileMapper extends BaseMapper {
+ /**
+ * @Description 分页列表
+ * @Author lqt
+ * @Date 2021/9/16
+ * @Param
+ * @Return
+ * @Exception
+ */
+ IPage queryPageList(IPage page,@Param("payWorkingGroupDataFile") PayWorkingGroupDataFile payWorkingGroupDataFile);
+
+
+ /**
+ * @Description 查询列表
+ * @Author lqt
+ * @Date 2021/9/16
+ * @Param
+ * @Return
+ * @Exception
+ */
+ List queryList(String workingGroupId);
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java
new file mode 100644
index 00000000..66fe04d0
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java
@@ -0,0 +1,14 @@
+package com.jero.project.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+
+/**
+ * @Description: pay_working_group_distribution_record
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+public interface PayWorkingGroupDistributionRecordMapper extends BaseMapper {
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
index c8f9c604..851660b2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
@@ -22,6 +22,7 @@
pcp.mail_contacts_id AS mailContactsId,
pcp.mail_contacts_temporary_name AS mailContactsTemporaryName,
pcp.pack,
+ pcp.files,
pcp.need_invoice AS needInvoice,
pcp.in_account AS inAccount,
pcp.make_invoice AS makeInvoice,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
new file mode 100644
index 00000000..a4d02904
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
new file mode 100644
index 00000000..bef1ff90
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java
new file mode 100644
index 00000000..db855ca0
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java
@@ -0,0 +1,36 @@
+package com.jero.project.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.project.entity.PayWorkingGroupDataFile;
+
+import java.util.List;
+
+/**
+ * @Description: pay_working_group_data_file
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+public interface IPayWorkingGroupDataFileService extends IService {
+
+ /**
+ * @Description 分页列表
+ * @Author lqt
+ * @Date 2021/9/16
+ * @Param
+ * @Return
+ * @Exception
+ */
+ IPage queryPageList(IPage page,PayWorkingGroupDataFile payWorkingGroupDataFile);
+ /**
+ * @Description 查询列表
+ * @Author lqt
+ * @Date 2021/9/16
+ * @Param
+ * @Return
+ * @Exception
+ */
+ List queryList(String workingGroupId);
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java
new file mode 100644
index 00000000..6b968fa6
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java
@@ -0,0 +1,15 @@
+package com.jero.project.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+
+/**
+ * @Description: pay_working_group_distribution_record
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+public interface IPayWorkingGroupDistributionRecordService extends IService {
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
new file mode 100644
index 00000000..d3b381c8
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
@@ -0,0 +1,41 @@
+package com.jero.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.project.entity.PayWorkingGroupDataFile;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+import com.jero.project.mapper.PayWorkingGroupDataFileMapper;
+import com.jero.project.service.IPayWorkingGroupDataFileService;
+import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * @Description: pay_working_group_data_file
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Service
+public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl implements IPayWorkingGroupDataFileService {
+
+ @Resource
+ private PayWorkingGroupDataFileMapper payWorkingGroupDataFileMapper;
+
+ @Override
+ public IPage queryPageList(IPage page, PayWorkingGroupDataFile payWorkingGroupDataFile) {
+ return payWorkingGroupDataFileMapper.queryPageList(page,payWorkingGroupDataFile);
+ }
+
+ @Override
+ public List queryList(String workingGroupId) {
+ return payWorkingGroupDataFileMapper.queryList(workingGroupId);
+ }
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
new file mode 100644
index 00000000..0685267a
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -0,0 +1,17 @@
+package com.jero.project.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper;
+import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
+import org.springframework.stereotype.Service;
+/**
+ * @Description: pay_working_group_distribution_record
+ * @Author: jeecg-boot
+ * @Date: 2021-09-16
+ * @Version: V1.0
+ */
+@Service
+public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl implements IPayWorkingGroupDistributionRecordService {
+
+}
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 2a83ec13..be8fc947 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -103,9 +103,6 @@ public class SysUserController {
@Resource
private BaseCommonService baseCommonService;
- @Resource
- private AuthenticationUtils authenticationUtils;
-
/**
* 根据角色id和部门id获取用户列表数据
*/
@@ -252,9 +249,6 @@ public class SysUserController {
@ApiOperation(value = "查询列表", notes = "查询列表")
@RequestMapping(value = "/payUserList", method = RequestMethod.GET)
public Result queryList2(SysUser user, HttpServletRequest req) {
- String publicKey = req.getParameter("publicKey");
- String token = req.getParameter("token");
- authenticationUtils.check(token,publicKey);
Result> result = new Result<>();
QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
//TODO 外部模拟登陆临时账号，列表不显示