Merge remote-tracking branch 'origin/main'
# Conflicts: # src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
This commit is contained in:
jiang
commit
b6a743c09e
|
|
@ -184,5 +184,7 @@ public class CarNeedPlanVo extends ParentVo {
|
|||
*/
|
||||
private String delFile;
|
||||
|
||||
private String outId;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,11 @@ public class AuditRecordVo extends ParentVo {
|
|||
*/
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 操作人昵称
|
||||
*/
|
||||
private String nikeName;
|
||||
|
||||
private String times;
|
||||
|
||||
private String phone;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ public class StringHelper {
|
|||
pfp.print(args);
|
||||
pfp.close();
|
||||
} catch (FileNotFoundException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +101,6 @@ public class StringHelper {
|
|||
try {
|
||||
return new String(content.getBytes("ISO_8859_1"), "UTF-8");
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
return content;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import java.util.concurrent.ThreadPoolExecutor;
|
|||
|
||||
/**
|
||||
* @author cw chen
|
||||
* @description TODO
|
||||
* @date 2022-08-22 14:42
|
||||
*/
|
||||
@EnableAsync
|
||||
|
|
|
|||
|
|
@ -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进行加密的
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
|
|||
// 验证令牌有效期，相差不足10分钟，自动刷新缓存
|
||||
tokenService.verifyToken(loginUser);
|
||||
//存入SecurityContextHolder
|
||||
//TODO 获取权限信息封装到Authentication中
|
||||
// 获取权限信息封装到Authentication中
|
||||
UsernamePasswordAuthenticationToken authenticationToken =
|
||||
new UsernamePasswordAuthenticationToken(loginUser,null, loginUser.getAuthorities());
|
||||
SecurityContextHolder.getContext().setAuthentication(authenticationToken);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
@ -309,6 +320,7 @@
|
|||
LEFT JOIN car_plan_out_details cpod on cpod.out_id = cpo.id and cpod.apply_id = cpo.apply_id
|
||||
WHERE cpo.apply_id = #{id}
|
||||
and cpo.sup_id = #{supId}
|
||||
and (cpo.status = 0 or cpo.status = 1)
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<select id="getRecordList" resultType="com.bonus.gzcar.business.system.entity.AuditRecordVo">
|
||||
select cpar.id, cpar.apply_id applyId, cpar.auditor, cpar.audit_time auditTime, cpar.audit_status auditStatus,
|
||||
cpar.audit_remark auditRemark, cpar.creator, cpar.create_time createTime,
|
||||
cpar.audit_type auditType, cpar.type,cpar.user_name userName,cpar.times,pu.TELPHONE phone
|
||||
cpar.audit_type auditType, cpar.type,cpar.user_name userName,cpar.times,pu.TELPHONE phone, pu.`NAME` nikeName
|
||||
from car_plan_audit_record cpar
|
||||
LEFT JOIN pm_user pu on pu.id=cpar.creator
|
||||
where apply_id=#{id}
|
||||
|
|
|
|||
Loading…
Reference in New Issue