diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index a1c264d..87dc329 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -68,6 +68,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController Map map = new HashMap<>(); String errInfo = "success"; PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); try { pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index f1345f1..77c9177 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -199,8 +199,8 @@ public class OperationsController extends BaseController { } } } - pd.put("FOREIGN_KEY", pd.getString("OPERATIONS_ID")); - pd.put("TYPE", 126); + pd.put("FOREIGN_KEY", pd.getString("VEHICLE")); + pd.put("TYPE", 122); List operationsinfoImgs = imgfilesService.listAll(pd);//营运证资料图片 map.put("pd", pd); map.put("operationsinfoImgs", operationsinfoImgs); @@ -293,7 +293,10 @@ public class OperationsController extends BaseController { pd.put("FOREIGN_KEY", pd.getString("ID")); pd.put("TYPE", 121); List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 + pd.put("TYPE", 122); + List operatingcertificateImgs = imgfilesService.listAll(pd);//营运证照片 map.put("drivingLicenseImgs", drivingLicenseImgs); + map.put("operatingcertificateImgs", operatingcertificateImgs); } map.put("list", resData); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java index e9edcd6..44b325f 100644 --- a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java +++ b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java @@ -9,6 +9,7 @@ import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; 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(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - List varList = safetyinvestmentuseService.listAll(pd); //列出SafetyInvestmentUse列表 + List 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("result", errInfo); return map;