From 054cd05c9af7c914b094f92087a5321cd6da6aeb Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 29 三月 2024 18:31:07 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 17 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java index 34c9fa3..0fb9968 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java @@ -515,7 +515,7 @@ InsuranceApply update = new InsuranceApply(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); - update.setStatus(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()); + update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�"); update.setCheckUserId(model.getCreator()); @@ -527,13 +527,18 @@ f.setCreator(model.getCreator()); f.setObjId(update.getId()); f.setCreateDate(update.getEditDate()); - f.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()); + f.setObjType(Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()); f.setType(Constants.TWO); f.setFileurl(fileurl); f.setFileurlFull(fullUrl); f.setInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�"); f.setName("鏂规纭涔�.pdf"); multifileMapper.insert(f); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS; + ApplyLog log = new ApplyLog(update,applyLogType.getName(), null + ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); return f; } @@ -567,6 +572,11 @@ f.setInfo("濮旀墭淇濅紒涓氬畬鎴愮缃叉姇淇濈敵璇蜂功"); f.setName("鎶曚繚鐢宠涔�.pdf"); multifileMapper.insert(f); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SIGNATURE; + ApplyLog log = new ApplyLog(update,applyLogType.getName(), null + ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); return f; } @@ -600,6 +610,12 @@ f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟"); f.setName("浜哄憳鍚嶅崟.pdf"); multifileMapper.insert(f); + + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST; + ApplyLog log = new ApplyLog(update,applyLogType.getName(), null + ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); return f; } @@ -642,6 +658,7 @@ f.setInfo("浼佷笟鐢宠琛ㄧ缃叉枃浠�"); f.setName("绛剧珷鐢宠琛�.pdf"); multifileMapper.insert(f); + Constants.ApplyLogType applyLogType =Constants.equalsInteger(Constants.ZERO,model.getType())? Constants.ApplyLogType.CA_JIAJIAN_APPLY_SIGN: Constants.ApplyLogType.CA_CHANGUNIT_APPLY_SIGN; ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); applyLogMapper.insert(log); @@ -674,6 +691,10 @@ f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟"); f.setName("绛剧珷浜哄憳鍚嶅崟.pdf"); multifileMapper.insert(f); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_WTB_FINISH_MEMBER_LIST; + ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); return f; } @@ -771,10 +792,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } //濮旀墭淇� 浼佷笟绛剧讲鎶曚繚纭涔� @@ -799,10 +820,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadFAQRSSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -828,10 +849,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadApplyMemberListSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -858,10 +879,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadTBSQSSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -890,10 +911,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadChangeSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -920,10 +941,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadChangeMemberListSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -947,12 +968,16 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadUnionApplySignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } + + + + } @Override @@ -2196,7 +2221,6 @@ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .eq(InsuranceApply::getId,smsCheckDTO.getBusinessId()) .last("limit 1"); - InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper); if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); -- Gitblit v1.9.3