jiangping
2024-02-04 8a0469c97262be9ecbc5eae38d812da789635c81
Merge remote-tracking branch 'origin/master'
已修改3个文件
27 ■■■■ 文件已修改
company/src/components/business/dispatchReview.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/dispatchUnitDetailsPlat.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/dispatchReview.vue
@@ -41,9 +41,9 @@
              <el-table-column
                  label="状态">
                <template slot-scope="{row}">
                  <span v-if="row.status === 0">待审核</span>
                  <span v-if="row.status === 1">审核通过</span>
                  <span v-if="row.status === 2">审核不通过</span>
                  <span :class="'du-status'+row.status" v-if="row.status === 0">待审核</span>
                  <span :class="'du-status'+row.status"  v-if="row.status === 1">审核通过</span>
                  <span :class="'du-status'+row.status"  v-if="row.status === 2">审核不通过</span>
                </template>
              </el-table-column>
            </el-table>
company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -23,13 +23,13 @@
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">派遣单位状态:</div>
                    <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">待审核</div>
                    <div class="info_list_item_val"   v-if="form.unitStatus === 1">
                      <span  style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">工种待审</span>
                      <span  style="color: green" v-if="form.worktypeStatus === 1">审核通过</span>
                      <span  style="color: red;" v-if="form.worktypeStatus === 2">工种审核不通过</span>
                    <div class="info_list_item_val" :class="'du-status'+row.status"  v-if="form.unitStatus === 0">待审核</div>
                    <div class="info_list_item_val"    v-if="form.unitStatus === 1">
                      <span :class="'du-status'+row.worktypeStatus"  style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">工种待审</span>
                      <span  :class="'du-status'+row.worktypeStatus"  v-if="form.worktypeStatus === 1">审核通过</span>
                      <span :class="'du-status'+row.worktypeStatus"  v-if="form.worktypeStatus === 2">工种审核不通过</span>
                     </div>
                    <div class="info_list_item_val"  style="color: red;" v-if="form.unitStatus === 2">审核不通过</div>
                    <div class="info_list_item_val"  :class="'du-status'+row.status" v-if="form.unitStatus === 2">审核不通过</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">派遣单位详述:</div>
@@ -67,9 +67,9 @@
                            <el-table-column
                                label="状态">
                                <template slot-scope="{row}">
                                    <span style="color:#2E68EC"  v-if="row.status === 0">待审核</span>
                                    <span style="color:green"  v-if="row.status === 1">审核通过</span>
                                    <span style="color:red"  v-if="row.status === 2">审核不通过</span>
                                    <span :class="'du-status'+row.status"  v-if="row.status === 0">待审核</span>
                                    <span :class="'du-status'+row.status"   v-if="row.status === 1">审核通过</span>
                                    <span :class="'du-status'+row.status"  v-if="row.status === 2">审核不通过</span>
                                </template>
                            </el-table-column>
<!--                            <el-table-column
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -896,11 +896,12 @@
//                        .selectAs(DuSolution::getId,DispatchUnit::getDuSolutionId)
//                        .leftJoin(DuSolution.class,DuSolution::getDispatchUnitId,DispatchUnit::getId)
                        .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
                        .select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId()+" limit 1) as du_solution_id" )
                        .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
                        .eq(DispatchUnit::getStatus,Constants.ZERO)
                        //.eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
                        .eq(DispatchUnit::getDataType,Constants.TWO)
                        .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id" )
                        .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and  b.solution_id="+dispatchUnitQueryDTO.getSolutionId() )
//                        .eq(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),DuSolution::getSolutionId,dispatchUnitQueryDTO.getSolutionId())
                        .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
                                " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +