Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 4f2a2b480f1d36782c315881bad50066a52e71aa

Merge remote-tracking branch 'origin/master'

 company/src/assets/icons/company/apply.png

 company/src/assets/icons/company/change_apply.png

 company/src/assets/icons/company/dipatch_unit.png

 company/src/assets/icons/company/settle.png

 company/src/assets/icons/company/tax.png

 company/src/assets/icons/plat/apply_check.png

 company/src/assets/icons/plat/change_apply_check.png

 company/src/assets/icons/plat/company_add.png

 company/src/assets/icons/plat/settle_check.png

 company/src/assets/icons/plat/tax_check.png

 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/OperaInsuranceApplyWindow.vue

@@ -83,7 +83,7 @@
                        <el-table-column
                            prop="currentFee"
                            align="center"
                            label="当前费用(元)">
                            label="产生费用(元)">
                        </el-table-column>
                        <el-table-column
                            prop="fee"

 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"

 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/views/business/insuranceApply.vue

@@ -4,7 +4,7 @@
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="保单状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @keypress.enter.native="search">
                    <el-option label="待审批" value="0"></el-option>
                    <el-option label="待审核" value="0"></el-option>
                    <el-option label="待出单" value="1"></el-option>
                  <el-option label="待签章" value="7"></el-option>
                  <el-option label="保障中" value="2"></el-option>

 company/src/views/business/policyList.vue

@@ -1,122 +1,150 @@
<template>
    <TableLayout :permissions="['business:insuranceapply:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="保单号" prop="status">
                <el-input v-model="searchForm.status" placeholder="请输入"></el-input>
            </el-form-item>
            <el-form-item label="保险方案" prop="solutionId">
                <el-select v-model="searchForm.solutionId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in options"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="状态" prop="status">
                <el-select v-model="searchForm.status" placeholder="请选择" @keypress.enter.native="search">
                    <el-option label="保障中" value="5"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in options"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
                <el-button @click="$refs.OperaPolicyListWindow.open('投保详情')">投保详情</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column label="序号" width="80px">
                    <template slot-scope="scope">
                        <span>{{scope.$index + 1}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="status" label="投保状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.status === 0">待审核</span>
                        <span v-if="row.status === 3">待出单</span>
                        <span v-if="row.status === 5">保障中</span>
                        <span v-if="row.status === 8">已过期</span>
                        <span v-if="row.status === 7">已退回</span>
                    </template>
                </el-table-column>
                <el-table-column prop="companyId" label="投保企业" min-width="100px"></el-table-column>
                <el-table-column prop="solutionId" label="保险方案" min-width="100px"></el-table-column>
                <el-table-column prop="solutionId" label="保单号" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="投保人数" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="在保时长（天）" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="产生费用（元）" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="总费用（元）" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="保险生效起期" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="保险生效止期" min-width="100px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
                    label="操作"
                    min-width="120"
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInsuranceApplyWindow.open('编辑投保申请信息表', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- 新建/修改 -->
        <OperaPolicyListWindow ref="OperaPolicyListWindow" @success="handlePageChange"/>
    </TableLayout>
  <TableLayout :permissions="['business:insuranceapply:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="保单状态" prop="statusCollect">
        <el-select v-model="searchForm.statusCollect" placeholder="请选择" @keypress.enter.native="search">
          <el-option label="待审核" value="0"></el-option>
          <el-option label="待出单" value="1"></el-option>
          <el-option label="待签章" value="7"></el-option>
          <el-option label="保障中" value="2" ></el-option>
          <el-option label="已过期" value="3"></el-option>
          <el-option label="已退回" value="4"></el-option>
          <el-option label="退回申请中" value="5"></el-option>
          <el-option label="已关闭" value="6"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
              :key="item.baseId"
              :label="item.name"
              :value="item.baseId">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionId">
        <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="提交日期" prop="createDate">
        <el-date-picker
            v-model="searchForm.createDate"
            @change="search"
            type="daterange"
            range-separator="至"
            value-format="yyyy-MM-dd"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
      >
        <el-table-column label="序号" width="80px">
          <template slot-scope="scope">
            <span>{{scope.$index + 1}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="statusInfo" label="投保状态" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="投保企业" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="solutionsName" 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="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>
        <el-table-column prop="createDate" label="提交时间"  align="center" min-width="100px"></el-table-column>
        <el-table-column
            v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
            label="操作"
            min-width="120"
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaInsuranceApplyWindow.open('编辑投保申请信息表', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
          @size-change="handleSizeChange"
          @current-change="handlePageChange"
          :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
    import BaseTable from '@/components/base/BaseTable'
    import TableLayout from '@/layouts/TableLayout'
    import Pagination from '@/components/common/Pagination'
    import OperaPolicyListWindow from '@/components/business/OperaPolicyListWindow'
    export default {
        name: 'policyList',
        extends: BaseTable,
        components: { TableLayout, Pagination, OperaPolicyListWindow },
        data () {
            return {
                // 搜索
                searchForm: {
                    createDate: '',
                    solutionId: '',
                    companyId: '',
                    status: ''
                }
            }
        },
        created () {
            this.config({
                module: '投保申请信息表',
                api: '/business/insuranceApply',
                'field.id': 'id',
                'field.main': 'id'
            })
            this.search()
        }
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { all as solutionAll} from '@/api/business/solutions'
import { pageAll as companyAll} from '@/api/business/company'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
export default {
  name: 'InsuranceApply',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        createTimeS: '',
        createTimeE: '',
        baseSolutionId: '',
        companyId: '',
        statusCollect: '2'
      },
      solutionList:[],
      companyList:[]
    }
  },
  created () {
    this.config({
      module: '投保申请信息表',
      api: '/business/insuranceApply',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
    this.loadSelectList()
  },
  methods:{
    // handlePageChange() {
    //   this.search()
    // },
    loadSelectList() {
      solutionAll({dataType:2}).then(res => {
        this.solutionList = res
      }).catch(err => {
      })
      companyAll({}).then(res => {
        this.companyList = res
      }).catch(err => {
      })
    }

  }
}
</script>

 company/src/views/enterprise/insuranceApply.vue

@@ -4,7 +4,7 @@
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @change="search">
                    <el-option label="待审批" value="0"></el-option>
                    <el-option label="待审核" value="0"></el-option>
                    <el-option label="待出单" value="1"></el-option>
                    <el-option label="待签章" value="7"></el-option>
                    <el-option label="保障中" value="2"></el-option>

 company/src/views/enterprise/myPolicy.vue

@@ -17,7 +17,7 @@
            </el-form-item>
            <el-form-item label="状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @change="search">
                    <el-option label="待审批" value="0"></el-option>
                    <el-option label="待审核" value="0"></el-option>
                    <el-option label="待出单" value="1"></el-option>
                    <el-option label="待签章" value="7"></el-option>
                    <el-option label="保障中" value="2"></el-option>

 company/src/views/index.vue

@@ -2,8 +2,14 @@
  <div class="home">
    <div class="home_inlet">
      <div class="home_inlet_label">快捷入口</div>
      <div class="home_inlet_list">
      <div class="home_inlet_list" v-if="userInfo.type==1" >
        <div class="home_inlet_item" v-for="(item, index) in cate" :key="index" @click="jump(item.url)">
          <img :src="item.icon" />
          <span>{{item.name}}</span>
        </div>
      </div>
      <div class="home_inlet_list" v-else >
        <div class="home_inlet_item" v-for="(item, index) in catePlat" :key="index" @click="jump(item.url)">
          <img :src="item.icon" />
          <span>{{item.name}}</span>
        </div>
@@ -18,7 +24,11 @@
      <div class="home_content_right">
        <div class="home_content_right_label" v-if="tabs && tabs.length>0" >代办事项</div>
        <el-tabs v-model="activeName" @tab-click="handleClick" >
          <el-tab-pane v-for="a in tabs" :key="a.path" :label="a.label" :name="a.name"></el-tab-pane>
          <el-tab-pane v-for="a in tabs" :key="a.path" :name="a.name" >
             <span slot="label"> {{a.label }}
                        <el-badge v-if="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2))  >0" :value="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) " class="item"></el-badge>
                    </span>
          </el-tab-pane>
        </el-tabs>
        <div v-if="activeName === '0'"  v-permissions="['business:notice:insurance']" >
          <div class="home_content_right_list">
@@ -125,28 +135,55 @@
      cate: [
        {
          name: '投保申请',
          url: '',
          icon: require('../assets/logo.png')
        },
        {
          name: '加保申请',
          url: '',
          icon: require('../assets/logo.png')
        },
        {
          name: '减保申请',
          url: '',
          icon: require('../assets/logo.png')
        },
        {
          name: '合同管理',
          url: '',
          icon: require('../assets/logo.png')
          url: '/enterprise/insuranceApply',
          icon: require('../assets/icons/company/apply.png')
        },
        {
          name: '提交报案',
          url: '',
          icon: require('../assets/logo.png')
          url: '/business/settleClaims',
          icon: require('../assets/icons/company/settle.png')
        },
        {
          name: '添加派遣单位',
          url: '/enterprise/dispatchUnit',
          icon: require('../assets/icons/company/dipatch_unit.png')
        },
        {
          name: '直保开票',
          url: '/enterprise/directInvoicing',
          icon: require('../assets/icons/company/tax.png')
        },
        {
          name: '委托保开票',
          url: '/enterprise/entrustedInvoicing',
          icon: require('../assets/icons/company/tax.png')
        }
      ],
      catePlat: [
        {
          name: '投保审核',
          url: '/business/insuranceApply',
          icon: require('../assets/icons/plat/apply_check.png')
        },
        {
          name: '加/减保审核',
          url: '/business/applyChange',
          icon: require('../assets/icons/plat/change_apply_check.png')
        },
        {
          name: '理赔服务',
          url: '/business/settleClaims',
          icon: require('../assets/icons/plat/settle_check.png')
        },
        {
          name: '发票管理',
          url: '/business/taxes',
          icon: require('../assets/icons/plat/tax_check.png')
        },
        {
          name: '新增企业',
          url: '/business/company',
          icon: require('../assets/icons/plat/company_add.png')
        }
      ]
    }
@@ -189,13 +226,13 @@
      var pemissons = this.userInfo.permissions

      if(pemissons.includes("business:notice:insurance")){
        this.tabs.push( {name:"0",label:"投保代办"})
        this.tabs.push( {name:"0",label:"投保代办" })
      }
      if(pemissons.includes("business:notice:tax")){
        this.tabs.push( {name:"1",label:"发票代办"})
        this.tabs.push( {name:"1",label:"发票代办" })
      }
      if(pemissons.includes("business:notice:settle")){
        this.tabs.push( {name:"2",label:"理赔代办"})
        this.tabs.push( {name:"2",label:"理赔代办" })
      }
      if(pemissons.includes("business:notice:insurance")){
        this.getNoticeList(0,this.page0 )
@@ -441,6 +478,7 @@
          }
          .list_item_left {
            display: flex;
            width: 60%;
            flex-direction: column;
            span {
              &:nth-child(1) {

 server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java

@@ -152,7 +152,7 @@
    }

    /**
     * 查询企业签约状态 审批状态,0正在申请1通过2驳回
     * 查询企业签约状态 审核状态,0正在申请1通过2驳回
     * @param email
     * @return
     */

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -635,8 +635,8 @@
        AUDIT_UN_PASS(2, "派遣单位不通过"),
        EDIT_UNIT(3, "修改派遣单位信息"),
        ADD_WORK_TYPE(4, "提交添加工种"),
        WORK_TYPE_AUDIT_PASS(5, "添加工种审批通过"),
        WORK_TYPE_AUDIT_UN_PASS(6, "添加工种审批不通过"),
        WORK_TYPE_AUDIT_PASS(5, "添加工种审核通过"),
        WORK_TYPE_AUDIT_UN_PASS(6, "添加工种审核不通过"),
        ;
        // 成员变量
        private String name;
@@ -678,7 +678,7 @@
    }

    public  enum ApplyCollectStatus {
        DSP(0, "待审批"),
        DSP(0, "待审核"),
        DCD(1, "待出单"),
        BZZ(2, "保障中"),
        YGQ(3, "已过期"),
@@ -822,7 +822,7 @@
        COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "企业申请退回(待签章)","提交意见：${param}",5),
        COMPANY_BACK_APPLY_SIGNATURE(8, "企业申请退回(已签章)","提交意见：${param}",5),
        CLOSE(9, "订单关闭","",6),
        PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",1),
        PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",0),
        ;
        // 成员变量
        private String name;
@@ -972,9 +972,9 @@

    public  enum NoticeType {

        ZERO(0, "待审批","","","待审核","已申请","待受理"),
        ZERO(0, "待审核","","","待审核","已申请","待受理"),
        ONE(1, "企业待签署","","","工种待审核","","完成受理"),
        TWO(2, "待出单","待审批","待审批","","",""),
        TWO(2, "待出单","待审核","待审核","","",""),
        THREE(3, "申请退回","申请退回","申请退回","","",""),
        FOUR(4, "已退回","已退回","已退回","","",""),
        FIVE(5, "申请驳回","申请驳回","申请驳回","","","")
@@ -1107,7 +1107,7 @@
    public  enum ApplyChangeStatus {
        UPLOAD(0, "提交加减保/换厂申请"),
        SIGNATURE(1, "已签章"),
        APPROVE(2, "已上传审批"),
        APPROVE(2, "已上传审核"),
        RETURN_APPLY_UPLOAD(3, "发起退回申请(待审核)"),
        RETURN_APPLY_SIGNATURE(4, "发起退回申请（已签章）"),
        PLATFORM_AGREE(5, "平台同意（已退回）"),
@@ -1277,8 +1277,8 @@
    public  enum ApplyChangeLogStatus {
        UPLOAD(0, "发起申请",""),
        RETURN_APPLY(3, "发起退回申请","提交意见：${param}"),
        PLATFORM_AGREE(4, "平台审批通过" ,"提交意见：${param}"),
        PLATFORM_UN_AGREE(0, "审批驳回","提交意见：${param}"),
        PLATFORM_AGREE(4, "平台审核通过" ,"提交意见：${param}"),
        PLATFORM_UN_AGREE(0, "审核驳回","提交意见：${param}"),
        CLOSE(5, "关闭",""),
        ;
        // 成员变量

 server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java

@@ -15,7 +15,7 @@
    @ApiModelProperty(value = "操作说明")
    private String optIllustration;

    @ApiModelProperty(value = "操作类型：3=退回申请；4=平台审批通过；5=审批驳回;6=关闭")
    @ApiModelProperty(value = "操作类型：3=退回申请；4=平台审核通过；5=审核驳回;6=关闭")
    private Integer optType;

}

 server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java

@@ -17,13 +17,13 @@
    @ApiModelProperty(value = "主键")
    private Integer id;

    @ApiModelProperty(value = "审批类别：0=单位审批；1=工种审批")
    @ApiModelProperty(value = "审核类别：0=单位审核；1=工种审核")
    private Integer auditType;

    @ApiModelProperty(value = "审批状态 1审核通过 2审核不通过")
    @ApiModelProperty(value = "审核状态 1审核通过 2审核不通过")
    private Integer status;

    @ApiModelProperty(value = "审批备注")
    @ApiModelProperty(value = "审核备注")
    private String auditRemark;



 server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java

@@ -71,6 +71,6 @@

    @ApiModelProperty(value = "即将失效订单：0=否；1=是")
    private Integer loseEfficacy;
    @ApiModelProperty(value = "状态 0待审批 1待出单 2保障中  3已过期 4已撤回 5退回申请中 6已关闭", example = "1")
    @ApiModelProperty(value = "状态 0待审核 1待出单 2保障中  3已过期 4已撤回 5退回申请中 6已关闭", example = "1")
    private Integer statusCollect;
}

 server/service/src/main/java/com/doumee/dao/business/model/DuLog.java

@@ -64,8 +64,8 @@
    @ExcelColumn(name="简介")
    private String content;

    @ApiModelProperty(value = "类型 0提交申请 1审批单位通过 2审批单位不通过 3修改单位信息 4添加工种 5审批工种通过 6审批工种不通过", example = "1")
    @ExcelColumn(name="类型 0提交申请 1审批单位通过 2审批单位不通过 3修改单位信息 4添加工种 5审批工种通过 6审批工种不通过")
    @ApiModelProperty(value = "类型 0提交申请 1审核单位通过 2审核单位不通过 3修改单位信息 4添加工种 5审核工种通过 6审核工种不通过", example = "1")
    @ExcelColumn(name="类型 0提交申请 1审核单位通过 2审核单位不通过 3修改单位信息 4添加工种 5审核工种通过 6审核工种不通过")
    private Integer objType;

    @ApiModelProperty(value = "关联对象编码")

 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java

@@ -180,7 +180,7 @@
    @ApiModelProperty(value = "处理企业申请状态  0同意 1驳回")
    @TableField(exist = false)
    private int dealBackApply;
    @ApiModelProperty(value = "状态 0待审批 1待出单 2保障中  3已过期 4已撤回 5退回申请中 6已关闭", example = "1")
    @ApiModelProperty(value = "状态 0待审核 1待出单 2保障中  3已过期 4已撤回 5退回申请中 6已关闭", example = "1")
    @TableField(exist = false)
    private Integer statusCollect;
    @ApiModelProperty(value = "集合状态" , example = "1")

 server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java

@@ -38,7 +38,7 @@
    Integer createSolution(SaveDispatchUnitDTO saveDispatchUnitDTO);

    /**
     * 派遣单位审批/工种审批
     * 派遣单位审核/工种审核
     * @param dispatchUnitAuditDTO
     */
    void auditData(DispatchUnitAuditDTO dispatchUnitAuditDTO);

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -626,7 +626,7 @@
                .eq(Company::getSignStatus,Constants.ONE));
        if(companyList!=null && companyList.size()>0){
            for(Company company :companyList){
                //查询企业签约状态 审批状态,0正在申请1通过2驳回
                //查询企业签约状态 审核状态,0正在申请1通过2驳回
                int status = signService.organizationAuditStatus(company.getEmail());
                if(status == 1){
                    Company update = new Company();
@@ -660,7 +660,7 @@
                .eq(Company::getSignIdStatus,Constants.ZERO));
        if(companyList!=null && companyList.size()>0){
            for(Company company :companyList){
                //查询企业签约状态 审批状态,0正在申请1通过2驳回
                //查询企业签约状态 审核状态,0正在申请1通过2驳回
                Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                        .eq(Multifile::getIsdeleted,Constants.ZERO)
                        .eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())

 server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java

@@ -555,7 +555,7 @@
        if(Objects.isNull(dispatchUnit)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到派遣单位信息");
        }
        //派遣单位审批
        //派遣单位审核
        if(dispatchUnitAuditDTO.getAuditType().equals(Constants.ZERO)){
            if(dispatchUnit.getStatus().equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"派遣单位信息已审核");

 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java

@@ -190,6 +190,7 @@
                .eq(Solutions::getBaseId,solutions.getId())
                .eq(Solutions::getDataType,Constants.TWO)
                .set(Solutions::getDataType,Constants.ONE)
                .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
        );
        //处理工作信息，新增最新的，同时产生历史版本
        dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);

 server/service/src/main/java/com/doumee/service/business/third/SignService.java

@@ -227,7 +227,7 @@
        return null;
    }
    /**
     * 查询企业签约状态 审批状态,0正在申请1通过2驳回
     * 查询企业签约状态 审核状态,0正在申请1通过2驳回
     * @param email
     * @return
     */