wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BUG优化

dev
xiepeng 2024-04-07 18:50:21 +08:00
parent 1d133a37c9
commit 02de9b04db
19 changed files with 309 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java
View File

@ -212,4 +212,18 @@ public class TrafficSafetyResponsibilityController extends BaseController {
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/getSafetyResponsibilityEdit")
@ResponseBody
public Object safetyCommitment() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = responseService.safetyCommitmentById(pd); //根据ID读取
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
}

28
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java
View File

@ -92,6 +92,13 @@ public class TrafficSecurityCommitmentController extends BaseController {
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
pd.put("VALIDSTATUS", "0");
} else {
pd.put("VALIDSTATUS", "1");
}
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@ -171,6 +178,13 @@ public class TrafficSecurityCommitmentController extends BaseController {
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
varList.forEach(securityCommitment -> {
if(DateUtil.compareDate(DateUtil.getDay(), securityCommitment.getString("EXPIRYDATE"))) {
securityCommitment.put("VALIDSTATUS", "2");
}else{
securityCommitment.put("VALIDSTATUS", "1");
}
});
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
@ -210,4 +224,18 @@ public class TrafficSecurityCommitmentController extends BaseController {
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/safetyCommitment")
@ResponseBody
public Object safetyCommitment() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = securityCommitmentService.safetyCommitmentById(pd); //根据ID读取
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
}

1
src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
View File

@ -26,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
/**
* 企业信息管理-货运挂车

13
src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java
View File

@ -158,14 +158,13 @@ public class InspectAnnuallyController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd);
List<PageData> varList = inspectAnnuallyService.list(page); //列出Question列表
for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "2");
}
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "1");
}
varList.forEach(inspectAnnually -> {
if("1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP"))) {
inspectAnnually.put("ARCHIVES_TYPE","2");
} else if ("1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED"))) {
inspectAnnually.put("ARCHIVES_TYPE","1");
}
});
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

52
src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
View File

@ -313,20 +313,18 @@ public class OperatingVehiclesController extends BaseController {
List<String> titles = new ArrayList<String>();
titles.add("车牌号"); //1
titles.add("车架号"); //2
//titles.add("车身编号"); //3
titles.add("车辆类型"); //4
titles.add("运营证号"); //5
titles.add("归属部门"); //6
titles.add("车主"); //7
titles.add("车主电话"); //8
titles.add("初登日期"); //9
titles.add("发证日期"); //10
titles.add("到期日期"); //11
titles.add("车辆品牌"); //12
titles.add("车辆型号"); //13
titles.add("核定总质量"); //14
titles.add("核定载质量"); //15
//titles.add("容积"); //16
titles.add("车辆类型"); //3
titles.add("运营证号"); //4
titles.add("归属部门"); //5
titles.add("车主"); //6
titles.add("车主电话"); //7
titles.add("初登日期"); //8
titles.add("发证日期"); //9
titles.add("到期日期"); //10
titles.add("车辆品牌"); //11
titles.add("车辆型号"); //12
titles.add("核定总质量"); //13
titles.add("核定载质量"); //14
dataMap.put("titles", titles);
List<PageData> varOList = operatingVehiclesService.listOut(pd);
List<PageData> varList = new ArrayList<PageData>();
@ -334,20 +332,18 @@ public class OperatingVehiclesController extends BaseController {
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("PLATE_NUMBER"));//1
vpd.put("var2", varOList.get(i).getString("FRAMES_NUMBER"));//2
//vpd.put("var3", varOList.get(i).getString("VEHICLE_BODY_NUMBER"));//3
vpd.put("var4", varOList.get(i).getString("VEHICLE_TYPE"));//4
vpd.put("var5", varOList.get(i).getString("OPERATING_CERTIFICATE"));//5
vpd.put("var6", varOList.get(i).getString("BELONGING_DEPARTMENT"));//6
vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER"));//7
vpd.put("var8", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//8
vpd.put("var9", varOList.get(i).getString("FIRSTSHOW_DATE"));//9
vpd.put("var10", varOList.get(i).getString("CERTIFICATE_DATE"));//10
vpd.put("var11", varOList.get(i).getString("EXPIRE_DATE"));//11
vpd.put("var12", varOList.get(i).getString("VEHICLE_BRAND"));//12
vpd.put("var13", varOList.get(i).getString("VEHICLE_MODEL"));//13
vpd.put("var14", varOList.get(i).getString("VOUCH_TOTALMASS"));//14
vpd.put("var15", varOList.get(i).getString("VOUCH_PAYLOAD"));//15
//vpd.put("var16", varOList.get(i).getString("VOLUME"));//16
vpd.put("var3", varOList.get(i).getString("VEHICLE_TYPE"));//3
vpd.put("var4", varOList.get(i).getString("OPERATING_CERTIFICATE"));//4
vpd.put("var5", varOList.get(i).getString("BELONGING_DEPARTMENT"));//5
vpd.put("var6", varOList.get(i).getString("VEHICLEOWNER"));//6
vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//7
vpd.put("var8", varOList.get(i).getString("FIRSTSHOW_DATE"));//8
vpd.put("var9", varOList.get(i).getString("CERTIFICATE_DATE"));//9
vpd.put("var10", varOList.get(i).getString("EXPIRE_DATE"));//10
vpd.put("var11", varOList.get(i).getString("VEHICLE_BRAND"));//11
vpd.put("var12", varOList.get(i).getString("VEHICLE_MODEL"));//12
vpd.put("var13", varOList.get(i).getString("VOUCH_TOTALMASS"));//13
vpd.put("var14", varOList.get(i).getString("VOUCH_PAYLOAD"));//14
varList.add(vpd);
}
dataMap.put("varList", varList);

40
src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
View File

@ -10,6 +10,9 @@ import com.zcloud.service.freighttrailer.FreightTrailerService;
import com.zcloud.service.system.DictionariesService;
import com.zcloud.service.taxationManage.TaxationManageService;
import com.zcloud.util.*;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -18,6 +21,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Controller
@RequestMapping("/taxationmanage")
@ -100,9 +106,6 @@ public class TaxationManageController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
@ -147,7 +150,14 @@ public class TaxationManageController extends BaseController {
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> taxationList = taxationManageService.list(page); //列出MajorDangerSource列表
List<PageData> assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID());
taxationList.forEach(taxation -> {
if("1".equals(taxation.get("ISSCRAP"))) {
taxation.put("ARCHIVES_TYPE", "1");
} else if ("1".equals(taxation.get("ISASSIGNED"))) {
taxation.put("ARCHIVES_TYPE", "2");
}
});
/*List<PageData> assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID());
List<PageData> varList = new ArrayList<>();
for (int i = 0; i < taxationList.size(); i++) {
for (int j = 0; j < assignedList.size(); j++) {
@ -157,8 +167,8 @@ public class TaxationManageController extends BaseController {
}
}
varList.add(taxationList.get(i));
}
map.put("varList", varList);
}*/
map.put("varList", taxationList);
map.put("page", page);
map.put("result", errInfo);
return map;
@ -187,14 +197,22 @@ public class TaxationManageController extends BaseController {
page.setPd(pd);
List<PageData> varList = freightTrailerService.list(page); // 列出所有挂车列表
List<PageData> taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表
for (int i = 0; i < taxationList.size(); i++) {
for (int j = 0; j < varList.size(); j++) {
if (taxationList.get(i).get("PLATE_NUMBER").equals(varList.get(j).get("PLATE_NUMBER")) && varList.get(j).get("ISSCRAP").equals("1")) {
varList.remove(j);
List<PageData> pageDataStream = new ArrayList<>();
if(!CollectionUtils.isEmpty(taxationList)) {
pageDataStream = varList.stream().filter(trailer -> { // 去除车船税类表中已有的车辆
for (PageData taxation : taxationList) {
if (!StringUtils.equals(taxation.getString("PLATE_NUMBER"), trailer.getString("PLATE_NUMBER"))) {
return true;
}
}
return false;
}).collect(Collectors.toList());
}else{
pageDataStream = varList;
}
map.put("varList", varList);
// 过滤掉车船税下拉列表中已报废的车辆信息
List<PageData> choiceTrailerList = pageDataStream.stream().filter(data -> !"1".equals(data.get("ISSCRAP"))).collect(Collectors.toList());
map.put("varList", choiceTrailerList);
map.put("page", page);
map.put("result", errInfo);
return map;

2
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java
View File

@ -19,4 +19,6 @@ public interface TrafficSafetyResponsibilityMapper {
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
List<PageData> safetyCommitmentById(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java
View File

@ -19,4 +19,6 @@ public interface TrafficSecurityCommitmentMapper {
List<PageData> datalistPageUser(Page page);
void delete(PageData pd);
List<PageData> safetyCommitmentById(PageData pd);
}

2
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java
View File

@ -17,4 +17,6 @@ public interface TrafficSafetyResponsibilityService {
List<PageData> listForSafetyResponsibilityUser(Page page);
void delete(PageData pd);
List<PageData> safetyCommitmentById(PageData pd);
}

2
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java
View File

@ -17,4 +17,6 @@ public interface TrafficSecurityCommitmentService {
List<PageData> listForSecurityCommitmentUser(Page page);
void delete(PageData pd);
List<PageData> safetyCommitmentById(PageData pd);
}

5
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java
View File

@ -43,4 +43,9 @@ public class TrafficSafetyResponsibilityServiceImpl implements TrafficSafetyResp
public void delete(PageData pd) {
responseMapper.delete(pd);
}
@Override
public List<PageData> safetyCommitmentById(PageData pd) {
return responseMapper.safetyCommitmentById(pd);
}
}

5
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java
View File

@ -43,4 +43,9 @@ public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityComm
public void delete(PageData pd) {
securityCommitmentMapper.delete(pd);
}
@Override
public List<PageData> safetyCommitmentById(PageData pd) {
return securityCommitmentMapper.safetyCommitmentById(pd);
}
}

6
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml
View File

@ -96,7 +96,11 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE},
<if test="VALIDSTATUS != null">
,VALIDSTATUS = #{VALIDSTATUS}
</if>
where
SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID}
</update>

28
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml
View File

@ -178,4 +178,32 @@
and f.USER_ID = #{pd.USER_ID}
</if>
</select>
<!--列表-->
<select id="safetyCommitmentById" parameterType="page" resultType="pd">
SELECT
u.NAME,
u.USER_ID,
i.CORP_NAME,
f.RESPONSIBILITYNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.EXPIRYDATE,
f.CREATETIME,
f.OPERATTIME,
f.CONTENT,
f.ATTACHMENT_ROUTE,
f.SAFETYRESPONSIBILITY_ID
FROM
<include refid="tableName"></include> f
left join sys_user u ON u.USER_ID = f.USER_ID and f.ISDELETE !='1'
left JOIN bus_corp_info i ON u.CORPINFO_ID = i.CORPINFO_ID
WHERE
u.ISDELETE = '0'
and (f.ISDELETE='0' or f.ISDELETE is null )
AND u.ISMAIN != '1'
AND ( f.VALIDSTATUS != '2' OR f.VALIDSTATUS IS NULL )
and f.SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
</select>
</mapper>

38
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml
View File

@ -109,9 +109,10 @@
CONTENT = #{CONTENT},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
<if test="VALIDSTATUS != null">
, VALIDSTATUS = #{VALIDSTATUS}
,VALIDSTATUS = #{VALIDSTATUS}
</if>
where SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
where
SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
</update>
<!-- 删除-->
@ -160,7 +161,6 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if>
ORDER BY c.OPERATTIME DESC
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@ -185,7 +185,39 @@
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>
ORDER BY f.OPERATTIME desc
</select>
<!--列表-->
<select id="safetyCommitmentById" parameterType="page" resultType="pd">
SELECT
u.NAME,
u.USER_ID,
i.CORP_NAME,
f.COMMITMENTNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.EXPIRYDATE,
f.CREATETIME,
f.OPERATTIME,
f.CONTENT,
f.ISDELETE,
f.ATTACHMENT_ROUTE,
f.SECURITYCOMMITMENT_ID
FROM
<include refid="tableName"></include> f
left join sys_user u ON u.USER_ID = f.USER_ID and f.ISDELETE !='1'
left JOIN bus_corp_info i ON u.CORPINFO_ID = i.CORPINFO_ID
WHERE
u.ISDELETE = '0'
and (f.ISDELETE='0' or f.ISDELETE is null )
AND u.ISMAIN != '1'
AND ( f.VALIDSTATUS != '2' OR f.VALIDSTATUS IS NULL )
and f.SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
and f.USER_ID = #{USER_ID}
</select>
</mapper>

3
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml
View File

@ -98,7 +98,8 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE},
EXPIRYDATE=#{EXPIRYDATE}
where
STAFFING_ID = #{STAFFING_ID}
</update>

79
src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml
View File

@ -8,6 +8,43 @@
</sql>
<!-- 字段 -->
<sql id="Field">
f.FREIGHTTRAILER_ID,
f.CORPINFO_ID,
f.NUM,
f.PLATE_NUMBER,
f.VIN,
f.VEHICLE_BODY_NUMBER,
f.TRAILER_TYPE,
f.OPER_CERTIFICATE_NUM,
f.BELONGING_DEPT,
f.CAR_OWNERS,
f.CAR_OWNERS_TEL,
f.CONTACTS,
f.CONTACT_PHONE,
f.INITIAL_REGISTRATION_DATE,
f.CERTIFICATE_DATE,
f.DUE_DATE,
f.TRAILER_BRAND,
f.TRAILER_MODEL,
f.APPROVED_TOTAL_MASS,
f.APPROVED_LOAD_CAPACITY,
f.VOLUME,
f.NOTES,
f.TRAILER_IMG,
f.DRIVING_LICENSE_IMG,
f.OPER_CERTIFICATE_IMG,
f.TRAILER_INFO,
f.CREATOR,
f.CREATORNAME,
f.CREATTIME,
f.ISDELETE,
f.ISSCRAP,
f.ISASSIGNED
</sql>
<!-- 字段 -->
<sql id="Field2">
FREIGHTTRAILER_ID,
@ -274,16 +311,50 @@
</select>
<select id="listOut" parameterType="pd" resultType="pd">
select
<include refid="Field2"></include>
from
<include refid="tableName"></include> f
SELECT
f.FREIGHTTRAILER_ID,
f.CORPINFO_ID,
f.NUM,
f.PLATE_NUMBER,
f.VIN,
f.VEHICLE_BODY_NUMBER,
f.TRAILER_TYPE,
f.OPER_CERTIFICATE_NUM,
o.NAME AS BELONGING_DEPT,
f.CAR_OWNERS,
f.CAR_OWNERS_TEL,
f.CONTACTS,
f.CONTACT_PHONE,
f.INITIAL_REGISTRATION_DATE,
f.CERTIFICATE_DATE,
f.DUE_DATE,
f.TRAILER_BRAND,
f.TRAILER_MODEL,
f.APPROVED_TOTAL_MASS,
f.APPROVED_LOAD_CAPACITY,
f.VOLUME,
f.NOTES,
f.TRAILER_IMG,
f.DRIVING_LICENSE_IMG,
f.OPER_CERTIFICATE_IMG,
f.TRAILER_INFO,
f.CREATOR,
f.CREATORNAME,
f.CREATTIME,
f.ISDELETE,
f.ISSCRAP,
f.ISASSIGNED
FROM
bus_traffic_mechanical_freighttrailer f
inner join oa_department o on f.BELONGING_DEPT = o.DEPARTMENT_ID
where f.ISDELETE = '0'
and f.FREIGHTTRAILER_ID in
<foreach item="item" index="index" open="(" separator="," close=")" collection="ArrayDATA_IDS">
#{item}
</foreach>
</select>
<select id="listAll" resultType="com.zcloud.entity.PageData">
select
*

39
src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
View File

@ -132,6 +132,23 @@
ISASSIGNED
</sql>
<!-- 字段用于新增 -->
<sql id="Field3">
PLATE_NUMBER,
FRAMES_NUMBER,
VEHICLE_TYPE,
OPERATING_CERTIFICATE,
VEHICLEOWNER,
VEHICLEOWNER_NUMBER,
FIRSTSHOW_DATE,
CERTIFICATE_DATE,
EXPIRE_DATE,
VEHICLE_BRAND,
VEHICLE_MODEL,
VOUCH_TOTALMASS,
VOUCH_PAYLOAD
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{OPERATING_ID},
@ -582,9 +599,9 @@
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.OPERATING_ID
where f.CORPINFO_ID = #{corpId}
and f.ISDELETE = '0'
and f.ISSCRAP = '0'
where
f.CORPINFO_ID = #{corpId}
and f.ISDELETE = '0' and f.ISSCRAP = '0'
</select>
<!-- 所属企业列表 -->
@ -598,9 +615,23 @@
<select id="listOut" parameterType="pd" resultType="pd">
select
<include refid="Field2"></include>
f.PLATE_NUMBER,
f.FRAMES_NUMBER,
f.VEHICLE_TYPE,
f.OPERATING_CERTIFICATE,
f.VEHICLEOWNER,
o.NAME AS BELONGING_DEPARTMENT,
f.VEHICLEOWNER_NUMBER,
f.FIRSTSHOW_DATE,
f.CERTIFICATE_DATE,
f.EXPIRE_DATE,
f.VEHICLE_BRAND,
f.VEHICLE_MODEL,
f.VOUCH_TOTALMASS,
f.VOUCH_PAYLOAD
from
<include refid="tableName"></include> f
INNER JOIN OA_DEPARTMENT o ON f.BELONGING_DEPARTMENT = o.DEPARTMENT_ID
where f.ISDELETE = '0'
and f.OPERATING_ID in
<foreach item="item" index="index" open="(" separator="," close=")" collection="ArrayDATA_IDS">

12
src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
View File

@ -403,11 +403,13 @@
<!-- 列表(全部) -->
<select id="datalistPage" parameterType="page" resultType="pd">
SELECT
f.*
f.*,
btmf.ISSCRAP AS ISSCRAP,
btmf.ISASSIGNED AS ISASSIGNED
FROM
<include refid="tableName"></include> f
LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.FREIGHTTRAILER_ID
WHERE f.ISDELETE = '0' AND btmf.ISSCRAP = '0'
WHERE f.ISDELETE = '0'
<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
AND f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}), '%')
</if>
@ -447,7 +449,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.TAXATION_ID = '0'
where f.ISDELETE = '0'
</select>
<select id="taxationList" parameterType="page" resultType="pd">
@ -455,7 +457,9 @@
*
from
<include refid="tableName"></include> f
where f.CORPINFO_ID = #{corpId}
where
f.CORPINFO_ID = #{corpId}
and f.ISDELETE = '0'
</select>