bonus
/
gz_car_manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
hayu 2025-07-08 11:43:19 +08:00
parent c363ec49f1
commit a508ea9437
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java
View File

@ -184,5 +184,7 @@ public class CarNeedPlanVo extends ParentVo {
*/
private String delFile;
private String outId;
}

4
src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java
View File

@ -41,11 +41,11 @@ public class UserAuthenticationProvider implements AuthenticationProvider {
if (userInfo == null) {
throw new UsernameNotFoundException("用户名不存在");
}
/* //密码加密
//密码加密
String daya= Md5Utils.createPwdEncrypt(userName,password.toUpperCase(),userInfo.getSalt());
if(!Md5Utils.validatePasswordBast64(daya, userInfo.getPassword())){
throw new BadCredentialsException("密码不正确");
}*/
}
// 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的

1
src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
View File

@ -137,6 +137,7 @@
</if>
order by cpa.create_time desc
</select>
<!--计划-->
<select id="getPlanList" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo">
select cpa.id, cpa.code,cpas.sup_id supId,cpas.contract_id contractId,cpa.type

17
src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
View File

@ -149,7 +149,7 @@
left join(
SELECT sum(dispatch_num) num ,apply_id
from car_plan_out
WHERE `status`=0
WHERE (`status` = 0 OR `status` = 1 )
GROUP BY apply_id
) outData on outData.apply_id=cpa.id
where cpa.status_type=1
@ -180,16 +180,27 @@
ORDER BY cpa.create_time desc
</select>
<select id="getDetailsList" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanDetailVo">
select cpd.id, cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num needNum,
select cpd.id, cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num - IFNULL( outData.num, 0 ) needNum,
cpd.remark,cpd.plan_type planType,cmti.type,cmti.name,cmti.model ,cmti.unit,cpas.sup_id supId,
cct.is_out_set isOutSet,cct.is_driver_set isDriverSet,cpas.contract_id contractId,cpd.model_id modelId
from car_plan_details cpd
LEFT JOIN car_plan_apply cpa on cpa.id=cpd.apply_id
left join car_plan_out cpo on cpo.apply_id=cpd.apply_id
left join car_plan_out_details cpod on cpod.apply_id=cpo.apply_id and cpd.model_id=cpod.model_id
left join car_plan_apply_sup cpas on cpd.apply_id=cpas.apply_id
LEFT JOIN car_ma_type_info cmti on cpd.model_id=cmti.id
LEFT JOIN car_contract_type cct on cct.model_id=cpd.model_id and cct.sup_id=cpas.sup_id and cpas.contract_id=cct.contract_id
where cpd.apply_id=#{id} and cpod.id is null
LEFT JOIN ( SELECT
sum( cpo.dispatch_num ) num,
cpod.model_id as modelId,
cpo.apply_id
FROM
car_plan_out cpo
LEFT JOIN car_plan_out_details cpod on cpod.out_id=cpo.id and cpod.apply_id=cpo.apply_id
GROUP BY
cpo.apply_id,cpod.model_id ) outData ON outData.apply_id = cpa.id and outData.modelId=cpd.model_id
where cpd.apply_id=#{id} and cpa.need_num>IFNULL(cpa.dispatch_num,0)
GROUP BY cpd.id
</select>
<select id="getContractPriceList" resultType="com.bonus.gzcar.business.backstage.entity.PriceVo">
select cct.id , cct.gls_ks glsStart,cct.gls_js glsEnd,cct.gl_sj_price price,