Commit 49d87fdf authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 57430022 9cbcb925
...@@ -33,7 +33,7 @@ public interface TEmployeeContractPreMapper extends BaseMapper<TEmployeeContract ...@@ -33,7 +33,7 @@ public interface TEmployeeContractPreMapper extends BaseMapper<TEmployeeContract
List<TEmployeeContractPreExportVo> getTEmployeeContractPreExport(@Param("tEmployeeContractPre") TEmployeeContractPreSearchVo tEmployeeContractPre); List<TEmployeeContractPreExportVo> getTEmployeeContractPreExport(@Param("tEmployeeContractPre") TEmployeeContractPreSearchVo tEmployeeContractPre);
List<EmployeeContractVO> getDisPatcherContractList(@Param("idList") List<String> idList,@Param("statusList") List<String> statusList); List<EmployeeContractVO> getDisPatcherContractList(@Param("idList") List<String> idList,@Param("statusList") List<String> statusList,@Param("type") String type);
List<TEmployeeContractPre> getAllUnconfimData(); List<TEmployeeContractPre> getAllUnconfimData();
......
...@@ -266,7 +266,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -266,7 +266,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
} }
//发起派单 //发起派单
List<ErrorMessage> errorMessageListAll = new ArrayList<>(); List<ErrorMessage> errorMessageListAll = new ArrayList<>();
List<EmployeeContractVO> excelVOList = baseMapper.getDisPatcherContractList(idList,CommonConstants.socialInfoStatus); List<EmployeeContractVO> excelVOList = baseMapper.getDisPatcherContractList(idList,CommonConstants.socialInfoStatus,type);
if (Common.isNotNull(excelVOList) && !excelVOList.isEmpty()) { if (Common.isNotNull(excelVOList) && !excelVOList.isEmpty()) {
List<EmployeeContractVO> disList; List<EmployeeContractVO> disList;
int k = 0; int k = 0;
......
...@@ -307,9 +307,6 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -307,9 +307,6 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
|| Common.isEmpty(domain.getEProvince())){ || Common.isEmpty(domain.getEProvince())){
return ArchivesConstants.SETTLE_DOMAIN_PROVINCE_NOT_EMPTY; return ArchivesConstants.SETTLE_DOMAIN_PROVINCE_NOT_EMPTY;
} }
if ( Common.isEmpty(domain.getCreateType())){
return "创建类型不可为空";
}
if (ArchivesConstants.CONTRACT_CREATE_TYPE.equals(domain.getCreateType()) if (ArchivesConstants.CONTRACT_CREATE_TYPE.equals(domain.getCreateType())
&& (Common.isEmpty(domain.getBusinessPrimaryType()) && (Common.isEmpty(domain.getBusinessPrimaryType())
|| Common.isEmpty(domain.getBusinessSecondType()) || Common.isEmpty(domain.getBusinessSecondType())
......
...@@ -1943,25 +1943,12 @@ ...@@ -1943,25 +1943,12 @@
a.COST_REDUCTION as costReduction, a.COST_REDUCTION as costReduction,
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag
/*
,phoneSubsidy.SALARY_MONEY as phoneSubsidy
annualBonus.SALARY_MONEY as annualBonus,
exemptionPersionTax.SALARY_MONEY as exemptionPersionTax,
enterpriseAnnuity.SALARY_MONEY as enterpriseAnnuity,
*/
from from
t_salary_account a t_salary_account a
/*left join t_salary_standard s on a.SALARY_FORM_ID = s.id
left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME = 'annualBonus'
left join t_salary_account_item exemptionPersionTax on exemptionPersionTax.SALARY_ACCOUNT_ID = a.id and exemptionPersionTax.JAVA_FIED_NAME='exemptionPersionTax'
left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction'
left join t_salary_account_item phoneSubsidy on phoneSubsidy.SALARY_ACCOUNT_ID = a.id and phoneSubsidy.JAVA_FIED_NAME='phoneSubsidy'*/
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<include refid="where_export"/> <include refid="where_export"/>
/*GROUP BY a.id */ ORDER BY a.SALARY_MONTH,a.id asc
ORDER BY a.SALARY_MONTH asc
<if test="searchVo != null"> <if test="searchVo != null">
<if test="searchVo.limitStart != null"> <if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd} limit #{searchVo.limitStart},#{searchVo.limitEnd}
...@@ -2015,7 +2002,7 @@ ...@@ -2015,7 +2002,7 @@
#{idStr} #{idStr}
</foreach> </foreach>
</if> </if>
ORDER BY a.SALARY_MONTH asc ORDER BY a.SALARY_MONTH,a.id asc
</where> </where>
</select> </select>
...@@ -2034,7 +2021,7 @@ ...@@ -2034,7 +2021,7 @@
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<include refid="where_export"/> <include refid="where_export"/>
ORDER BY a.SALARY_MONTH asc ORDER BY a.SALARY_MONTH,a.id asc
<if test="searchVo != null"> <if test="searchVo != null">
<if test="searchVo.limitStart != null"> <if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd} limit #{searchVo.limitStart},#{searchVo.limitEnd}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment