From c7a022c304c49fa91da1ebae458ccec3c484718a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 10:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/enterprise/entrustedInvoicing.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 2
company/src/components/enterprise/additionSubtractionApplication.vue | 2
company/src/components/enterprise/factoryChange.vue | 2
company/src/components/business/OperaInsuranceApplyWindow.vue | 4 +-
company/src/components/enterprise/reinsurance.vue | 2
company/src/views/enterprise/myPolicy.vue | 2
company/src/components/enterprise/renewalInsurance.vue | 2
company/src/components/business/OperaApplyChangeWindow.vue | 2
company/src/components/business/OperaSolutionsWindow.vue | 14 +++---
company/src/views/business/policyList.vue | 2
server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java | 2
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 4 +-
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 7 ++-
company/src/components/business/OperaPolicyListWindow.vue | 4 +-
company/src/components/business/OperaCompanyWindow.vue | 6 +-
company/src/components/enterprise/editFactoryChange.vue | 2
19 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index fd3d992..c0b2328 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -144,7 +144,7 @@
</el-table-column>
<el-table-column
prop="fee"
- label="浜х敓璐圭敤锛堝厓锛�">
+ label="宸蹭骇鐢熻垂鐢紙鍏冿級">
</el-table-column>
</el-table>
<div class="desc_item_from_page">
diff --git a/company/src/components/business/OperaApplyChangeWindow.vue b/company/src/components/business/OperaApplyChangeWindow.vue
index 7332b4d..a173a9f 100644
--- a/company/src/components/business/OperaApplyChangeWindow.vue
+++ b/company/src/components/business/OperaApplyChangeWindow.vue
@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="浜х敓璐圭敤">
+ label="宸蹭骇鐢熻垂鐢�">
</el-table-column>
<el-table-column
prop="address"
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 14bfedd..04cf3eb 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -198,9 +198,9 @@
phone: [
{ required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
],
- taxAccount: [
- { required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
- ],
+ // taxAccount: [
+ // { required: true, message: '璇疯緭鍏ラ摱琛屽崱' }
+ // ],
email: [
{ required: true, message: '璇疯緭鍏ヨ璇侀偖绠�' }
],
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 795023e..591c714 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -87,7 +87,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -255,7 +255,7 @@
:key="Math.random()"
align="center"
prop="fee"
- label="浜х敓璐圭敤锛堝厓锛�">
+ label="宸蹭骇鐢熻垂鐢紙鍏冿級">
</el-table-column>
</el-table>
<el-table
diff --git a/company/src/components/business/OperaPolicyListWindow.vue b/company/src/components/business/OperaPolicyListWindow.vue
index 472e8d3..af67c7b 100644
--- a/company/src/components/business/OperaPolicyListWindow.vue
+++ b/company/src/components/business/OperaPolicyListWindow.vue
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="浜х敓璐圭敤">
+ label="宸蹭骇鐢熻垂鐢�">
</el-table-column>
<el-table-column
prop="address"
@@ -157,7 +157,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="浜х敓璐圭敤锛堝厓锛�">
+ label="宸蹭骇鐢熻垂鐢紙鍏冿級">
</el-table-column>
</el-table>
<div class="desc_item_from_page">
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 365bbd4..55ea177 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -27,7 +27,7 @@
<div style="display: flex; align-items: center;">
<el-select v-model="form.minAge" style="flex: 1;" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in 60"
+ v-for="item in 80"
:key="item"
:label="item"
:value="item">
@@ -36,7 +36,7 @@
<span style="margin: 0 30px;">鑷�</span>
<el-select v-model="form.maxAge" style="flex: 1;" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in 60"
+ v-for="item in 80"
:key="item"
:label="item"
:value="item">
@@ -88,9 +88,9 @@
<el-form-item label="鎺ユ敹鏂囦欢閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鎶曚繚鍗曠绔犲叧閿瓧锛堝鏈夊涓叧閿瓧锛岃浣跨敤鑻辨枃鍒嗗彿 ; 闅斿紑锛�" prop="signKeyword">
+<!-- <el-form-item label="鎶曚繚鍗曠绔犲叧閿瓧锛堝鏈夊涓叧閿瓧锛岃浣跨敤鑻辨枃鍒嗗彿 ; 闅斿紑锛�" prop="signKeyword">
<el-input v-model="form.signKeyword" placeholder="澶氫釜鑻辨枃鍒嗗彿 ; 闅斿紑" v-trim/>
- </el-form-item>
+ </el-form-item>-->
<el-button type="primary" @click="add">娣诲姞宸ョ</el-button>
<el-table
:data="form.worktypeIdList"
@@ -208,9 +208,9 @@
type: [
{ required: true, message: '璇烽�夋嫨鎶曚繚绫诲瀷' }
],
- signKeyword: [
- { required: true, message: '璇疯緭鍏ユ姇淇濆崟绛剧珷鍏抽敭瀛�' }
- ]
+ // signKeyword: [
+ // { required: false, message: '璇疯緭鍏ユ姇淇濆崟绛剧珷鍏抽敭瀛�' }
+ // ]
},
company: [],
typeWork: []
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index c807afd..1702884 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -78,7 +78,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 852b841..1d123ae 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -77,7 +77,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 31c896f..6335c16 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -77,7 +77,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index 3faec31..a3e573e 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -78,7 +78,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
index ec0ad3a..bad4d11 100644
--- a/company/src/components/enterprise/renewalInsurance.vue
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -28,7 +28,7 @@
</el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
<el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
- <el-table-column prop="currentFee" label="浜х敓璐圭敤"></el-table-column>
+ <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
<el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
diff --git a/company/src/views/business/policyList.vue b/company/src/views/business/policyList.vue
index 6017299..adf1410 100644
--- a/company/src/views/business/policyList.vue
+++ b/company/src/views/business/policyList.vue
@@ -75,7 +75,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" align="center" min-width="100px"></el-table-column>
<el-table-column prop="serviceDays" align="center" label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�"> </el-table-column>
- <el-table-column prop="currentFee" align="center" label="浜х敓璐圭敤(鍏�)"></el-table-column>
+ <el-table-column prop="currentFee" align="center" label="宸蹭骇鐢熻垂鐢�(鍏�)"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" align="center" min-width="100px"></el-table-column>
<el-table-column prop="startTime" label="淇濋櫓鐢熸晥璧锋湡" align="center" min-width="100px"></el-table-column>
<el-table-column prop="endTime" label="淇濋櫓鐢熸晥姝㈡湡" align="center" min-width="100px"></el-table-column>
diff --git a/company/src/views/enterprise/entrustedInvoicing.vue b/company/src/views/enterprise/entrustedInvoicing.vue
index 3f424a7..162a15a 100644
--- a/company/src/views/enterprise/entrustedInvoicing.vue
+++ b/company/src/views/enterprise/entrustedInvoicing.vue
@@ -25,7 +25,7 @@
</el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
<el-table-column prop="code" label="淇濆崟鍙�"></el-table-column>
- <el-table-column label="浜х敓璐圭敤锛堝厓锛�">
+ <el-table-column label="宸蹭骇鐢熻垂鐢紙鍏冿級">
<template slot-scope="{row}">
<span>{{row.currentFee}}</span>
</template>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 3188b54..c87b329 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -94,7 +94,7 @@
</el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
<el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
- <el-table-column prop="currentFee" label="浜х敓璐圭敤"></el-table-column>
+ <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
<el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 58da84c..270fced 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -16,8 +16,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
@Slf4j
public class ScheduleTool {
@Autowired
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 5e503fb..7bf1ba9 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -555,7 +555,7 @@
public static void main(String[] args) {
- System.out.println("hello&&devicenumber=22110002&&uuid=1e52008fb8ff\n".length());
+ System.out.println("{\"companyName\":\"搴斿疂绉戞妧\",\"endtime\":\"2024-03-01 17:19:00\",\"erpId\":\"4D40185D5BC74A13821BE46EAF8B4179\",\"erpWithVisitDTOList\":[],\"faceImg\":\"20240304/1709518170325_742.jpg\",\"idcardNo\":\"342501199609300535\",\"idcardType\":0,\"name\":\"榛勬檵\",\"phone\":\"17756328697\",\"reason\":\"鎺㈤櫓\",\"receptMemberId\":\"E7E514BD7DE3F27CE0530B630A0AEAE0\",\"starttime\":\"2024-03-01 13:18:00\"}");
}
/**
* 鐢ㄦ埛绫诲瀷 0绯荤粺鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鏈嶅姟鏈烘瀯绠＄悊鍛� 3鏈嶅姟鏈烘瀯瀛愯处鍙� 4缁煎悎鏈嶅姟鍗曚綅绠＄悊鍛� 5缁煎悎鏈嶅姟鍗曚綅瀛愯处鍙� 6涓撳 7鍘垮尯鐢ㄦ埛 8甯傚眬鐢ㄦ埛
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
index 3c55bcb..1120564 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
@@ -132,7 +132,7 @@
@ApiModelProperty(value = "宸ョ缂栫爜(鍏宠仈worktype)", example = "1")
private Integer worktypeId;
- @ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
+ @ApiModelProperty(value = "褰撳墠宸蹭骇鐢熻垂鐢�", example = "1")
private BigDecimal currentFee;
@ApiModelProperty(value = "璐圭敤", example = "1")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index ee34315..c32d163 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -539,7 +539,7 @@
if(new Date().compareTo(DateUtil.getMontageDate(detail.getStartTime(), 2))>=0){
Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), detail.getStartTime()) + 1;
- //濡傛灉宸蹭骇鐢熻垂鐢紝璁＄畻宸蹭骇鐢熻垂鐢�
+ //濡傛灉宸插凡浜х敓璐圭敤锛岃绠楀凡宸蹭骇鐢熻垂鐢�
add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
}else{
add.setCurrentFee(BigDecimal.ZERO);
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index 9e3ac44..73596b0 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -269,7 +269,8 @@
// params.put("file",file);
params.put("url",fileUrl);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+// params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",0); //鎸囧畾鍏珷浣嶇疆绫诲瀷:0鎴杗ull浣跨敤绛惧瓧搴ф爣浣嶇疆鎴栦笉鎸囧畾绛惧瓧浣嶇疆;1琛ㄥ崟鍩熷畾浣�(琛ㄥ崟鍩熷鏋滀笂浼犱负pdf鏃�,闇�pdf鑷瀹氫箟濂借〃鍗曞煙,html鍙妘rl鍙妕mpl绛夐渶瀹氫箟濂絠nput鏍囩);2鍏抽敭瀛楀畾涔�
params.put("fileType",1);
params.put("needQifengSign",1);
params.put("notifyUrl",notifyUrl);
@@ -280,8 +281,8 @@
sReq.setIdentityCard(creditCoe);//钀ヤ笟鎵х収鍙�
sReq.setEmail(email); //鍦ㄥ悰瀛愮娉ㄥ唽璁よ瘉鐨勯偖绠�
// sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
-// sReq.setChapteJson(postionJson);
- sReq.setSearchKey(postionJson);
+// sReq.setChapteJson(postionJson);//琛ㄥ崟鍩熷畾浣� 瀵瑰簲positionType=1
+// sReq.setSearchKey(postionJson);//鍏抽敭瀛� 瀵瑰簲positionType=2
sReq.setSignId(singId);
sReq.setNoNeedVerify(1);
signatories.add(sReq);
--
Gitblit v1.9.3