|
@@ -1078,7 +1078,7 @@ class TalentAllowance extends EnterpriseController {
|
|
$columns[] = [AllowanceProjectEnum::getProjectName($projects[$i]), $months];
|
|
$columns[] = [AllowanceProjectEnum::getProjectName($projects[$i]), $months];
|
|
}
|
|
}
|
|
$list = \app\common\model\TalentAllowanceProject::alias("pro")
|
|
$list = \app\common\model\TalentAllowanceProject::alias("pro")
|
|
- ->field("ta.id,ta.year,ta.enterpriseId as curEnterpriseId,ta.address,ta.name,ta.sex,ta.idCard,ta.talentArrange,ta.identifyCondition,ta.identifyGetTime,ta.identifyConditionName,ta.identifyMonth,ta.allowanceType,ta.months,ta.money,ta.moneyDesc,ta.checkState,ta.publicState,pro.project,pro.months as pre_months,con.enterpriseId,con.startTime,con.endTime,con.entryTime,con.quitTime,con.isQuit")
|
|
|
|
|
|
+ ->field("ta.id,ta.year,ta.enterpriseId as curEnterpriseId,ta.address,ta.name,ta.sex,ta.idCard,ta.talentArrange,ta.identifyCondition,ta.identifyGetTime,ta.identifyConditionName,ta.virtualAmount,ta.identifyMonth,ta.allowanceType,ta.months,ta.money,ta.moneyDesc,ta.checkState,ta.publicState,pro.project,pro.months as pre_months,con.enterpriseId,con.startTime,con.endTime,con.entryTime,con.quitTime,con.isQuit")
|
|
->leftJoin("un_talent_allowance_info ta", "ta.id=pro.mainId")
|
|
->leftJoin("un_talent_allowance_info ta", "ta.id=pro.mainId")
|
|
->leftJoin("un_talent_allowancecontract_detail con", "pro.baseId=con.id")
|
|
->leftJoin("un_talent_allowancecontract_detail con", "pro.baseId=con.id")
|
|
->where($where)
|
|
->where($where)
|