jiangping
2024-03-04 c7a022c304c49fa91da1ebae458ccec3c484718a
Merge remote-tracking branch 'origin/master'
已修改19个文件
65 ■■■■ 文件已修改
company/src/components/business/OperaApplyChangeDetailWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaApplyChangeWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaCompanyWindow.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyWindow.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaPolicyListWindow.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaSolutionsWindow.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/additionSubtractionApplication.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/editFactoryChange.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/factoryChange.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/reinsurance.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/renewalInsurance.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/policyList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/entrustedInvoicing.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/myPolicy.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/task/ScheduleTool.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/core/utils/Constants.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/third/SignService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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">
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"
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: '请输入认证邮箱' }
        ],
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
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">
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: []
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"
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"
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"
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"
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>
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>
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>
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>
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
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市局用户
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")
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);
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或null使用签字座标位置或不指定签字位置;1表单域定位(表单域如果上传为pdf时,需pdf自行定义好表单域,html及url及tmpl等需定义好input标签);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);