LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:企业端分标委

Browse Source
This commit is contained in:
zhangqinlin
2021-12-24 11:44:11 +08:00
parent 90b6450891
commit 6f232bdb1b
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
-3
View File
@@ -91,12 +91,9 @@ public class AuthenticationUtils {
}catch (Exception e){ }catch (Exception e){
throw new JeroBootException("数据同步失败！连接超时"); throw new JeroBootException("数据同步失败！连接超时");
} }
RSA rsa = new RSA(null,publicKey); RSA rsa = new RSA(null,publicKey);
byte[] token = rsa.encrypt(StrUtil.bytes(APPLICATION_TOKEN, CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey); byte[] token = rsa.encrypt(StrUtil.bytes(APPLICATION_TOKEN, CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
String tokenStr = Base64.getEncoder().encodeToString(token); String tokenStr = Base64.getEncoder().encodeToString(token);
map.put("publicKey",publicKey); map.put("publicKey",publicKey);
map.put("token",tokenStr); map.put("token",tokenStr);
return map; return map;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+3 -3
View File
@@ -129,14 +129,14 @@ public class AllProjectStatisticsController {
/** /**
* 企业项目统计——分页列表查询 * 科室来款统计——分页列表查询
* *
* @param allProjectStatisticsSearch 企业项目统计 * @param allProjectStatisticsSearch 企业项目统计
* @param pageNo 页数 * @param pageNo 页数
* @param pageSize 条数 * @param pageSize 条数
*/ */
@RequiresPermissions("projectPaymentStatistics:search") @RequiresPermissions("projectPaymentStatistics:search")
@ApiOperation(value = "项目来款统计-分页列表查询", notes = "项目来款统计-详情分页列表查询") @ApiOperation(value = "科室来款统计-分页列表查询", notes = "科室来款统计-详情分页列表查询")
@GetMapping(value = "/listProject") @GetMapping(value = "/listProject")
public Result<?> listProject(AllProjectStatisticsSearch allProjectStatisticsSearch, public Result<?> listProject(AllProjectStatisticsSearch allProjectStatisticsSearch,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -168,7 +168,7 @@ public class AllProjectStatisticsController {
return Result.OK(); return Result.OK();
} }
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize); Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,null); IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
double sum=0; double sum=0;
double sumTwo =0; double sumTwo =0;
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+1 -1
View File
@@ -193,8 +193,8 @@ public class CommonController {
} else { } else {
ossFile.setDownloadNumber(downloadNumber + 1); ossFile.setDownloadNumber(downloadNumber + 1);
} }
ossFileService.updateAndPush(ossFile);
ossFileService.saveDownloadTimes(ossFile.getId(), null); ossFileService.saveDownloadTimes(ossFile.getId(), null);
ossFileService.updateAndPush(ossFile);
} else if ("view".equals(type)) { } else if ("view".equals(type)) {
Integer viewNumber = ossFile.getViewNumber(); Integer viewNumber = ossFile.getViewNumber();
if (viewNumber == null) { if (viewNumber == null) {