Skip to content

L
long-tern-care-service
Commit 98760722 authored by zhangwanglin's avatar zhangwanglin
Browse files
Options

注释街道

parent 7274e0da
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 15 deletions
account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java
View file @ 98760722
...@@ -132,7 +132,9 @@ public class AccountController { ...@@ -132,7 +132,9 @@ public class AccountController {
@GetMapping("/getSrvTaskList") @GetMapping("/getSrvTaskList")
public Result<Page<SrvTaskRespVO>> getSrvTaskList(@RequestHeader("Authorization") String token,SrvTaskReqVO srvTaskReqVO) { public Result<Page<SrvTaskRespVO>> getSrvTaskList(@RequestHeader("Authorization") String token,SrvTaskReqVO srvTaskReqVO) {
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvTaskReqVO.setSrvOrganId(srvOrganId); if(srvOrganId != 0) {
srvTaskReqVO.setSrvOrganId(srvOrganId);
}
return Result.success(accountService.getSrvTaskList(srvTaskReqVO)); return Result.success(accountService.getSrvTaskList(srvTaskReqVO));
} }
...@@ -148,7 +150,9 @@ public class AccountController { ...@@ -148,7 +150,9 @@ public class AccountController {
List<String> list = Arrays.asList("1"); List<String> list = Arrays.asList("1");
srvOrganListReq.setAccountsStatusList(list); srvOrganListReq.setAccountsStatusList(list);
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvOrganListReq.setSrvOrganId(srvOrganId); if(srvOrganId != 0) {
srvOrganListReq.setSrvOrganId(srvOrganId);
}
return Result.success(accountService.searchSrvOrganAccountList(srvOrganListReq)); return Result.success(accountService.searchSrvOrganAccountList(srvOrganListReq));
} }
...@@ -163,7 +167,9 @@ public class AccountController { ...@@ -163,7 +167,9 @@ public class AccountController {
List<String> list = Arrays.asList("2", "3","4"); List<String> list = Arrays.asList("2", "3","4");
srvOrganListReq.setAccountsStatusList(list); srvOrganListReq.setAccountsStatusList(list);
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvOrganListReq.setSrvOrganId(srvOrganId); if(srvOrganId != 0) {
srvOrganListReq.setSrvOrganId(srvOrganId);
}
return Result.success(accountService.searchSrvOrganAccountList(srvOrganListReq)); return Result.success(accountService.searchSrvOrganAccountList(srvOrganListReq));
} }
...@@ -214,7 +220,9 @@ public class AccountController { ...@@ -214,7 +220,9 @@ public class AccountController {
List<String> accountsStatusList = Arrays.asList("0", "1"); List<String> accountsStatusList = Arrays.asList("0", "1");
srvOrganListReq.setAccountsStatusList(accountsStatusList); srvOrganListReq.setAccountsStatusList(accountsStatusList);
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvOrganListReq.setSrvOrganId(srvOrganId); if(srvOrganId !=0) {
srvOrganListReq.setSrvOrganId(srvOrganId);
}
Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,srvOrganListReq); Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,srvOrganListReq);
return Result.success(chAssessDetailAccounts); return Result.success(chAssessDetailAccounts);
} }
...@@ -229,7 +237,9 @@ public class AccountController { ...@@ -229,7 +237,9 @@ public class AccountController {
List<String> list = Arrays.asList("1", "2"); List<String> list = Arrays.asList("1", "2");
srvOrganListReq.setAccountsStatusList(list); srvOrganListReq.setAccountsStatusList(list);
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvOrganListReq.setSrvOrganId(srvOrganId); if(srvOrganId != 0) {
srvOrganListReq.setSrvOrganId(srvOrganId);
}
Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,srvOrganListReq); Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,srvOrganListReq);
return Result.success(chAssessDetailAccounts); return Result.success(chAssessDetailAccounts);
} }
...@@ -333,7 +343,9 @@ public class AccountController { ...@@ -333,7 +343,9 @@ public class AccountController {
@GetMapping("/queryOverallCostList") @GetMapping("/queryOverallCostList")
public Result<Page<OverallCostListRespVO>> queryOverallCostList(@RequestHeader("Authorization") String token,OverallCostReqVO req) { public Result<Page<OverallCostListRespVO>> queryOverallCostList(@RequestHeader("Authorization") String token,OverallCostReqVO req) {
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
req.setSrvOrganId(srvOrganId); if(srvOrganId != 0) {
req.setSrvOrganId(srvOrganId);
}
Page<OverallCostListRespVO> overallCostRecords = accountService.queryFreeRdInfo(req); Page<OverallCostListRespVO> overallCostRecords = accountService.queryFreeRdInfo(req);
return Result.success(overallCostRecords); return Result.success(overallCostRecords);
} }
......
apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java
View file @ 98760722
...@@ -506,14 +506,16 @@ public class DisableController { ...@@ -506,14 +506,16 @@ public class DisableController {
*/ */
@RequestMapping("/disableInfoList") @RequestMapping("/disableInfoList")
public Result<Page<DisableInfoListVo>> disableInfoList(@RequestHeader("Authorization") String token,Integer pageNum, Integer pageSize, Long srvOrganId,String certiCode,String realName,String svrModelId) { public Result<Page<DisableInfoListVo>> disableInfoList(@RequestHeader("Authorization") String token,Integer pageNum, Integer pageSize, Long srvOrganId,String certiCode,String realName,String svrModelId) {
if (pageNum == null || pageNum < 1 || srvOrganId == null || srvOrganId == 0) { if (pageNum == null || pageNum < 1) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (pageSize == null || pageSize < 1) { if (pageSize == null || pageSize < 1) {
pageSize = 10; pageSize = 10;
} }
long srvOrganIdL = TokenParsingUtil.TokenParsing(token, "srvOrganId"); long srvOrganIdL = TokenParsingUtil.TokenParsing(token, "srvOrganId");
srvOrganId = new Long(srvOrganIdL); if(srvOrganIdL != 0) {
srvOrganId = new Long(srvOrganIdL);
}
Page<DisableInfoListVo> page = new Page<>(pageNum, pageSize); Page<DisableInfoListVo> page = new Page<>(pageNum, pageSize);
page = disableService.getDisableInfoList(page, srvOrganId,certiCode,realName,svrModelId); page = disableService.getDisableInfoList(page, srvOrganId,certiCode,realName,svrModelId);
return Result.success(page); return Result.success(page);
......
apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java
View file @ 98760722
...@@ -91,7 +91,8 @@ public class SrvOrganController { ...@@ -91,7 +91,8 @@ public class SrvOrganController {
@PostMapping("/srvOrgan") @PostMapping("/srvOrgan")
public Result saveSrvOrgan(SrvOrganVo srvOrganVo) { public Result saveSrvOrgan(SrvOrganVo srvOrganVo) {
//null == srvOrganVo.getLevelCode() || null == srvOrganVo.getBunk() || || StrUtil.isBlank(srvOrganVo.getPermitId()) //null == srvOrganVo.getLevelCode() || null == srvOrganVo.getBunk() || || StrUtil.isBlank(srvOrganVo.getPermitId())
if (StrUtil.isBlank(srvOrganVo.getOrganId()) || StrUtil.isBlank(srvOrganVo.getDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getDistrictCity()) || StrUtil.isBlank(srvOrganVo.getDistrictArea()) || StrUtil.isBlank(srvOrganVo.getAcptProvincial()) || StrUtil.isBlank(srvOrganVo.getAcptCity()) || StrUtil.isBlank(srvOrganVo.getAcptArea()) || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getBankDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getBankDistrictCity()) || StrUtil.isBlank(srvOrganVo.getSrvOrganName()) || null == srvOrganVo.getOrganTypeId() || StrUtil.isBlank(srvOrganVo.getLinkName()) || StrUtil.isBlank(srvOrganVo.getLinkTel()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getUnifiedSocialCreditCode()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getAccName()) || StrUtil.isBlank(srvOrganVo.getBankAccCode()) || StrUtil.isBlank(srvOrganVo.getBankAccName()) || StrUtil.isBlank(srvOrganVo.getBankNo()) || StrUtil.isBlank(srvOrganVo.getBankDistrictWebsite()) || null == srvOrganVo.getCardType() || null == srvOrganVo.getFileDataList() || srvOrganVo.getFileDataList().size() < 3) { // || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getAcptStreet())
if (StrUtil.isBlank(srvOrganVo.getOrganId()) || StrUtil.isBlank(srvOrganVo.getDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getDistrictCity()) || StrUtil.isBlank(srvOrganVo.getDistrictArea()) || StrUtil.isBlank(srvOrganVo.getAcptProvincial()) || StrUtil.isBlank(srvOrganVo.getAcptCity()) || StrUtil.isBlank(srvOrganVo.getAcptArea()) || StrUtil.isBlank(srvOrganVo.getBankDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getBankDistrictCity()) || StrUtil.isBlank(srvOrganVo.getSrvOrganName()) || null == srvOrganVo.getOrganTypeId() || StrUtil.isBlank(srvOrganVo.getLinkName()) || StrUtil.isBlank(srvOrganVo.getLinkTel()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getUnifiedSocialCreditCode()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getAccName()) || StrUtil.isBlank(srvOrganVo.getBankAccCode()) || StrUtil.isBlank(srvOrganVo.getBankAccName()) || StrUtil.isBlank(srvOrganVo.getBankNo()) || StrUtil.isBlank(srvOrganVo.getBankDistrictWebsite()) || null == srvOrganVo.getCardType() || null == srvOrganVo.getFileDataList() || srvOrganVo.getFileDataList().size() < 3) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
// 参数校验通过，调用service添加护理机构 // 参数校验通过，调用service添加护理机构
...@@ -112,7 +113,8 @@ public class SrvOrganController { ...@@ -112,7 +113,8 @@ public class SrvOrganController {
@PostMapping("/updateSrvOrgan") @PostMapping("/updateSrvOrgan")
public Result updateSrvOrgan(SrvOrganVo srvOrganVo) { public Result updateSrvOrgan(SrvOrganVo srvOrganVo) {
//StrUtil.isBlank(srvOrganVo.getPermitId()) || null == srvOrganVo.getLevelCode() || null == srvOrganVo.getBunk() || //StrUtil.isBlank(srvOrganVo.getPermitId()) || null == srvOrganVo.getLevelCode() || null == srvOrganVo.getBunk() ||
if (null == srvOrganVo.getSrvOrganId() || StrUtil.isBlank(srvOrganVo.getOrganId()) || StrUtil.isBlank(srvOrganVo.getDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getDistrictCity()) || StrUtil.isBlank(srvOrganVo.getDistrictArea()) || StrUtil.isBlank(srvOrganVo.getAcptProvincial()) || StrUtil.isBlank(srvOrganVo.getAcptCity()) || StrUtil.isBlank(srvOrganVo.getAcptArea()) || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getBankDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getBankDistrictCity()) || StrUtil.isBlank(srvOrganVo.getSrvOrganName()) || null == srvOrganVo.getOrganTypeId() || StrUtil.isBlank(srvOrganVo.getLinkName()) || StrUtil.isBlank(srvOrganVo.getLinkTel()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getUnifiedSocialCreditCode()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getAccName()) || StrUtil.isBlank(srvOrganVo.getBankAccCode()) || StrUtil.isBlank(srvOrganVo.getBankAccName()) || StrUtil.isBlank(srvOrganVo.getBankNo()) || StrUtil.isBlank(srvOrganVo.getBankDistrictWebsite()) || null == srvOrganVo.getCardType() || null == srvOrganVo.getFileDataList() || srvOrganVo.getFileDataList().size() < 3) { // || StrUtil.isBlank(srvOrganVo.getAcptStreet()) || StrUtil.isBlank(srvOrganVo.getAcptStreet())
if (null == srvOrganVo.getSrvOrganId() || StrUtil.isBlank(srvOrganVo.getOrganId()) || StrUtil.isBlank(srvOrganVo.getDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getDistrictCity()) || StrUtil.isBlank(srvOrganVo.getDistrictArea()) || StrUtil.isBlank(srvOrganVo.getAcptProvincial()) || StrUtil.isBlank(srvOrganVo.getAcptCity()) || StrUtil.isBlank(srvOrganVo.getAcptArea()) || StrUtil.isBlank(srvOrganVo.getBankDistrictProvincial()) || StrUtil.isBlank(srvOrganVo.getBankDistrictCity()) || StrUtil.isBlank(srvOrganVo.getSrvOrganName()) || null == srvOrganVo.getOrganTypeId() || StrUtil.isBlank(srvOrganVo.getLinkName()) || StrUtil.isBlank(srvOrganVo.getLinkTel()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getUnifiedSocialCreditCode()) || StrUtil.isBlank(srvOrganVo.getSrvType()) || StrUtil.isBlank(srvOrganVo.getAccName()) || StrUtil.isBlank(srvOrganVo.getBankAccCode()) || StrUtil.isBlank(srvOrganVo.getBankAccName()) || StrUtil.isBlank(srvOrganVo.getBankNo()) || StrUtil.isBlank(srvOrganVo.getBankDistrictWebsite()) || null == srvOrganVo.getCardType() || null == srvOrganVo.getFileDataList() || srvOrganVo.getFileDataList().size() < 3) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
// 参数校验通过，调用service修改护理机构 // 参数校验通过，调用service修改护理机构
......
apply/apply-service/src/main/resources/mapper/DisableInfoMapper.xml
View file @ 98760722
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hungraim.ltc.dao.DisableInfoMapper"> <mapper namespace="com.hungraim.ltc.dao.DisableInfoMapper">
<select id="getDisableInfoList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoListVo"> <select id="getDisableInfoList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoListVo">
SELECT T1.PROGRAM_ID programId, SELECT distinct T1.PROGRAM_ID programId,
T1.SRV_ORGAN_ID srvOrganId, T1.SRV_ORGAN_ID srvOrganId,
T1.DISAB_INFO_ID disabInfoId, T1.DISAB_INFO_ID disabInfoId,
T5.DISTRICT_PROVINCIAL districtProvincial, T5.DISTRICT_PROVINCIAL districtProvincial,
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
LEFT JOIN CH_CFG_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.MODE_ID LEFT JOIN CH_CFG_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.MODE_ID
LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
<where> <where>
T1.PROG_STATUS !=2 1=1
<if test="srvOrganId != null and srvOrganId != '' and srvOrganId!=0"> <if test="srvOrganId != null and srvOrganId != '' and srvOrganId!=0">
and T1.SRV_ORGAN_ID = #{srvOrganId} and T1.SRV_ORGAN_ID = #{srvOrganId}
</if> </if>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
and T2.CERTI_CODE = #{certiCode} and T2.CERTI_CODE = #{certiCode}
</if> </if>
<if test="realName != null and realName != ''"> <if test="realName != null and realName != ''">
and T2.real_name = #{realName} and T2.real_name like CONCAT(CONCAT('%',#{realName}) ,'%')
</if> </if>
<if test="svrModelId != null and svrModelId != ''"> <if test="svrModelId != null and svrModelId != ''">
and T7.MODE_ID = #{svrModelId} and T7.MODE_ID = #{svrModelId}
......
governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java
View file @ 98760722
...@@ -125,7 +125,8 @@ public class AprOrganController { ...@@ -125,7 +125,8 @@ public class AprOrganController {
if (chAprOrgan.getOrganTypeId() == null) {//机构类型id if (chAprOrgan.getOrganTypeId() == null) {//机构类型id
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (StringUtils.isBlank(chAprOrgan.getAcptProvincial()) || StringUtils.isBlank(chAprOrgan.getAcptCity()) || StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) || StringUtils.isBlank(chAprOrgan.getAcptStreet())) {//机构详细地址 //|| StringUtils.isBlank(chAprOrgan.getAcptStreet())
if (StringUtils.isBlank(chAprOrgan.getAcptProvincial()) || StringUtils.isBlank(chAprOrgan.getAcptCity()) || StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) ) {//机构详细地址
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名 if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名
...@@ -178,7 +179,8 @@ public class AprOrganController { ...@@ -178,7 +179,8 @@ public class AprOrganController {
if (chAprOrgan.getOrganTypeId() == null) {//机构类型id if (chAprOrgan.getOrganTypeId() == null) {//机构类型id
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) || StringUtils.isBlank(chAprOrgan.getAcptStreet())) {//机构详细地址 //|| StringUtils.isBlank(chAprOrgan.getAcptStreet())
if (StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) ) {//机构详细地址
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名 if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment