yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改小程序长者端绑定护理单元时，护理单元未设置缴费金额时的提示语 

2、统一资源上传接口 兼容pad端
This commit is contained in:
1378012178@qq.com 2026-04-01 11:21:19 +08:00
parent 8da55ea63b
commit 33e48c8111
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -188,7 +188,7 @@ public class ElderApi {
IPage<OrgAllInfoApiEntity> list = orgApplyInfoApi.queryOrgAllInfo(pageNo, pageSize, orgCode, null);
List<OrgAllInfoApiEntity> records = list.getRecords();
System.out.println("1111111111111111111:"+orgCode+"----------"+records);
System.out.println("1111111111111111111:" + orgCode + "----------" + records);
if (records == null || records.size() == 0) {
return Result.ok(null);
}
@ -198,16 +198,17 @@ public class ElderApi {
JSONObject orgInfo = null;
try {
orgInfo = sysBaseAPI.getOrgInfo(orgCode, "payable_amount");
System.out.println("2222222222222222222222:"+orgInfo);
System.out.println("2222222222222222222222:" + orgInfo);
} finally {
DynamicDataSourceContextHolder.clear();
}
result.setNuId(nuId);
if (orgInfo != null && StringUtils.isNotBlank(orgInfo.getString("payableAmount"))) {
result.setPayableAmount(new BigDecimal(orgInfo.getString("payableAmount")));
System.out.println("2222222222222222222222:"+orgInfo);
System.out.println("2222222222222222222222:" + orgInfo);
} else {
result.setNuCanUse("1");
result.setMsg("护理单元暂时无法绑定");
result.setMsg("未设置缴费金额");
return Result.ok(result);
}
@ -215,7 +216,6 @@ public class ElderApi {
if (baseInfo == null) {
return Result.ok(null);
}
result.setNuId(nuId);
result.setNuStatus(baseInfo.getStatus());//使用状态 0未使用 1占用 2入住 3退住 4留床
//===！！！如果改变绑定规则 业务端同时也需要修改！！！===
@ -340,8 +340,8 @@ public class ElderApi {
}
}
ElderInfoEntity elderInfoEn1 = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(),elderInfoEntity.getIdCard());
if(elderInfoEn1!=null && StringUtils.isNotBlank(elderInfoEn1.getNuId())){
ElderInfoEntity elderInfoEn1 = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(), elderInfoEntity.getIdCard());
if (elderInfoEn1 != null && StringUtils.isNotBlank(elderInfoEn1.getNuId())) {
return Result.error("此长者入住中，不可变更");
}
@ -395,8 +395,8 @@ public class ElderApi {
if (NuRedisUtils.existKey(ukey)) {
return Result.error("提交过于频繁，请稍后重试");
}
ElderInfoEntity elderInfoEn = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(),elderInfoEntity.getIdCard());
if(elderInfoEn!=null && StringUtils.isNotBlank(elderInfoEn.getNuId()) && !StringUtils.equals(elderInfoEntity.getNuId(),elderInfoEn.getNuId()) && StringUtils.equals("zz",elderInfoEntity.getModifyType())){
ElderInfoEntity elderInfoEn = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(), elderInfoEntity.getIdCard());
if (elderInfoEn != null && StringUtils.isNotBlank(elderInfoEn.getNuId()) && !StringUtils.equals(elderInfoEntity.getNuId(), elderInfoEn.getNuId()) && StringUtils.equals("zz", elderInfoEntity.getModifyType())) {
return Result.error("此长者入住中，不可变更");
}

15
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View File

@ -438,7 +438,7 @@ public class CommonController {
* @return
*/
@PostMapping(value = "/static/upload/export")
public Result<?> upload(@RequestParam(value = "name", defaultValue = "aaa") String secureKey, @RequestParam(value = "size",defaultValue = "1") String fileSize, HttpServletRequest request, HttpServletResponse response) throws Exception {
public Result<?> upload(@RequestParam(value = "name", defaultValue = "aaa") String secureKey, @RequestParam(value = "size", defaultValue = "1") String fileSize, HttpServletRequest request, HttpServletResponse response) throws Exception {
Result<?> result = new Result<>();
//先验证秘钥是否正确
if (!SafetyUtil.validateSecureKey(secureKey)) {
@ -453,13 +453,18 @@ public class CommonController {
//验证文件名称、大小是否可具备存储“资格”
{
boolean contains = redisUtil.sGet("canuploadparams").contains(file.getOriginalFilename() + "-" + fileSize);
if (!contains) {
String[] s = file.getOriginalFilename().split("_");
boolean containsSub = false;
if (s.length > 1) {
containsSub = redisUtil.sGet("canuploadparams").contains(file.getOriginalFilename().split("_")[1] + "-" + fileSize);
}
if (contains || containsSub) {
//删除set中元素
redisUtil.setRemove("canuploadparams", file.getOriginalFilename() + "-" + fileSize);
} else {
result.setMessage("上传失败！");
result.setSuccess(false);
return result;
} else {
//删除set中元素
redisUtil.setRemove("canuploadparams", file.getOriginalFilename() + "-" + fileSize);
}
}
String savePath = "";