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

BUG优化

dev
xiepeng 2024-04-25 09:52:09 +08:00
parent aab7cc1666
commit d27456c596
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java
View File

@ -68,6 +68,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); List<PageData> commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd);
try { try {
pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取

7
src/main/java/com/zcloud/controller/operations/OperationsController.java
View File

@ -199,8 +199,8 @@ public class OperationsController extends BaseController {
} }
} }
} }
pd.put("FOREIGN_KEY", pd.getString("OPERATIONS_ID")); pd.put("FOREIGN_KEY", pd.getString("VEHICLE"));
pd.put("TYPE", 126); pd.put("TYPE", 122);
List<PageData> operationsinfoImgs = imgfilesService.listAll(pd);//营运证资料图片 List<PageData> operationsinfoImgs = imgfilesService.listAll(pd);//营运证资料图片
map.put("pd", pd); map.put("pd", pd);
map.put("operationsinfoImgs", operationsinfoImgs); map.put("operationsinfoImgs", operationsinfoImgs);
@ -293,7 +293,10 @@ public class OperationsController extends BaseController {
pd.put("FOREIGN_KEY", pd.getString("ID")); pd.put("FOREIGN_KEY", pd.getString("ID"));
pd.put("TYPE", 121); pd.put("TYPE", 121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
pd.put("TYPE", 122);
List<PageData> operatingcertificateImgs = imgfilesService.listAll(pd);//营运证照片
map.put("drivingLicenseImgs", drivingLicenseImgs); map.put("drivingLicenseImgs", drivingLicenseImgs);
map.put("operatingcertificateImgs", operatingcertificateImgs);
} }
map.put("list", resData); map.put("list", resData);
map.put("result", errInfo); map.put("result", errInfo);

15
src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java
View File

@ -9,6 +9,7 @@ import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ObjectExcelView; import com.zcloud.util.ObjectExcelView;
import com.zcloud.util.Tools; import com.zcloud.util.Tools;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
/** /**
* 说明：安全投入使用 * 说明：安全投入使用
@ -128,7 +131,17 @@ public class SafetyInvestmentUseController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
List<PageData> varList = safetyinvestmentuseService.listAll(pd); //列出SafetyInvestmentUse列表 List<PageData> varList = safetyinvestmentuseService.listAll(pd); //列出SafetyInvestmentUse列表
// 计算预提额合计
Double drawingsTotal = varList.stream().
filter(data -> StringUtils.equals(data.getString("USE_TYPE"), "1"))
.mapToDouble(data -> Double.valueOf(data.getString("AMOUNT"))).sum();
varList.forEach(data -> {
});
map.put("drawingsTotal", drawingsTotal);
map.put("varList", varList); map.put("varList", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;