添加排序
This commit is contained in:
parent
93d3133e14
commit
fa456034d0
|
|
@ -54,7 +54,7 @@ public class AppController{
|
||||||
@DecryptAndVerify(decryptedClass = AppPlanVo.class)
|
@DecryptAndVerify(decryptedClass = AppPlanVo.class)
|
||||||
public PageInfo<AppPlanVo> getPlanList(EncryptedReq<AppPlanVo> dto) {
|
public PageInfo<AppPlanVo> getPlanList(EncryptedReq<AppPlanVo> dto) {
|
||||||
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
|
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
|
||||||
List<AppPlanVo> list = service.getPlanList(dto.getData());;
|
List<AppPlanVo> list = service.getPlanList(dto.getData());
|
||||||
return new PageInfo<>(list);
|
return new PageInfo<>(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ public class AppServiceImpl implements AppService{
|
||||||
}
|
}
|
||||||
return ServerResponse.createSuccess(outIds);
|
return ServerResponse.createSuccess(outIds);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.error(e.toString(),e);
|
log.error(e.toString(),e);
|
||||||
}
|
}
|
||||||
return ServerResponse.createSuccess(new ArrayList<>());
|
return ServerResponse.createSuccess(new ArrayList<>());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
cpa.code like concat('%',#{keyWord},'%')
|
cpa.code like concat('%',#{keyWord},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
order by cpa.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
<select id="getAuditList" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
<select id="getAuditList" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
||||||
select cpo.id outId ,cpo.apply_id planId ,pro.name proName ,cs.name supName ,cpa.type,cpo.status,cpa.code,
|
select cpo.id outId ,cpo.apply_id planId ,pro.name proName ,cs.name supName ,cpa.type,cpo.status,cpa.code,
|
||||||
|
|
@ -48,11 +49,12 @@
|
||||||
and cpo.status !='0'
|
and cpo.status !='0'
|
||||||
</if>
|
</if>
|
||||||
</if>
|
</if>
|
||||||
|
order by cpo.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getPlanDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
<select id="getPlanDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
||||||
SELECT cpa.id planId,code,cpa.type,cpa.pro_id proId ,cpa.project_content projectContent,cpa.project_part projectPart,
|
SELECT cpa.id planId,code,cpa.type,cpa.pro_id proId ,cpa.project_content projectContent,cpa.project_part projectPart,
|
||||||
cpa.need_time needDay,cpa.need_num needNum,cpa.dispatch_num dispatchNum,cpa.remark,pro.name proName,
|
cpa.need_time needDay,cpa.need_num needNum,cpa.dispatch_num dispatchNum,cpa.remark,pro.name proName,
|
||||||
IF( cpa.type=1,'运输车辆','吊车') typeName
|
IF( cpa.type=1,'车辆','吊车') typeName
|
||||||
from car_plan_apply cpa
|
from car_plan_apply cpa
|
||||||
left join bm_project pro on pro.bid_id=cpa.pro_id
|
left join bm_project pro on pro.bid_id=cpa.pro_id
|
||||||
WHERE cpa.id=#{planId}
|
WHERE cpa.id=#{planId}
|
||||||
|
|
@ -93,7 +95,14 @@
|
||||||
<select id="getAuditDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
<select id="getAuditDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
|
||||||
select id outId,status
|
select id outId,status
|
||||||
FROM car_plan_out
|
FROM car_plan_out
|
||||||
WHERE apply_id=#{planId}
|
WHERE 1=1
|
||||||
|
<if test="planId!=null and planId!=''">
|
||||||
|
and apply_id=#{planId}
|
||||||
|
</if>
|
||||||
|
<if test="outId!=null and outId!=''">
|
||||||
|
and id=#{outId}
|
||||||
|
</if>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
<if test="supName!=null and supName!=''">
|
<if test="supName!=null and supName!=''">
|
||||||
and cs.name like concat('%',#{supName},'%')
|
and cs.name like concat('%',#{supName},'%')
|
||||||
</if>
|
</if>
|
||||||
|
order by csi.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getCarSupDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarCarVo">
|
<select id="getCarSupDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarCarVo">
|
||||||
select csi.id,csi.car_num carNum,csi.brand,csi.type,csi.ton,IFNULL(file1.num,0) xyNum,
|
select csi.id,csi.car_num carNum,csi.brand,csi.type,csi.ton,IFNULL(file1.num,0) xyNum,
|
||||||
|
|
|
||||||
|
|
@ -167,6 +167,7 @@
|
||||||
<if test="type!=null and type!=''">
|
<if test="type!=null and type!=''">
|
||||||
and cc.type=#{type}
|
and cc.type=#{type}
|
||||||
</if>
|
</if>
|
||||||
|
order by cc.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getSupList" resultType="com.bonus.gzcar.business.backstage.entity.CarContractSupVo">
|
<select id="getSupList" resultType="com.bonus.gzcar.business.backstage.entity.CarContractSupVo">
|
||||||
select ccr.sup_id supId,csp.name supName,ccr.ratio ,ccr.ratio_money ratioMoney,
|
select ccr.sup_id supId,csp.name supName,ccr.ratio ,ccr.ratio_money ratioMoney,
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@
|
||||||
<if test="supName!=null and supName!=''">
|
<if test="supName!=null and supName!=''">
|
||||||
and cs.name like concat('%',#{supName},'%')
|
and cs.name like concat('%',#{supName},'%')
|
||||||
</if>
|
</if>
|
||||||
|
ORDER BY cdi.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getDriverDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarDriverVo">
|
<select id="getDriverDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarDriverVo">
|
||||||
select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,cs.name supName
|
select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,cs.name supName
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
and name like concat('%',#{name},'%')
|
and name like concat('%',#{name},'%')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
|
order by create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getCarSupByName" resultType="java.lang.Integer">
|
<select id="getCarSupByName" resultType="java.lang.Integer">
|
||||||
select count(1)
|
select count(1)
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,7 @@
|
||||||
and cmt.is_active=#{isActive}
|
and cmt.is_active=#{isActive}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
|
order by cmt.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getNumByName" resultType="java.lang.Integer">
|
<select id="getNumByName" resultType="java.lang.Integer">
|
||||||
select count(1)
|
select count(1)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue