forked from integrated_whb/integrated_whb
优化BUG
parent
56de84e337
commit
8b613dda3a
|
@ -31,6 +31,8 @@ import org.springframework.web.servlet.ModelAndView;
|
|||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
|
@ -308,13 +308,16 @@ public class InsureController extends BaseController {
|
|||
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
|
||||
map.put("drivingLicenseImgs", drivingLicenseImgs);
|
||||
}
|
||||
varList.forEach(operating -> {
|
||||
operatingList.forEach(operating -> {
|
||||
operating.put("ID", operating.getString("OPERATING_ID"));
|
||||
});
|
||||
map.put("list", varList);
|
||||
map.put("list", operatingList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if ("2".equals(pd.getString("TRAFFIC_TYPE"))) {
|
||||
// 货运挂车
|
||||
List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
|
||||
|
@ -338,10 +341,10 @@ public class InsureController extends BaseController {
|
|||
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
|
||||
map.put("drivingLicenseImgs", drivingLicenseImgs);
|
||||
}
|
||||
varList.forEach(freight -> {
|
||||
freightList.forEach(freight -> {
|
||||
freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
|
||||
});
|
||||
map.put("list", varList);
|
||||
map.put("list", freightList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
|
|
@ -94,5 +94,7 @@ public interface FreightTrailerMapper {
|
|||
void editInspectTreight(PageData pd);
|
||||
|
||||
PageData findTrailerByPlateNumber(PageData pd);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -152,5 +152,6 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
|
|||
public PageData findTrailerByPlateNumber(PageData pd) {
|
||||
return freightTrailerMapper.findTrailerByPlateNumber(pd);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1016,6 +1016,7 @@ public class UsersServiceImpl implements UsersService {
|
|||
@Override
|
||||
public void editPractitioner(PageData pd, MultipartFile[] files) throws Exception {
|
||||
usersMapper.editPractitioner(pd);
|
||||
pd.put("PERSONNEL_TYPE", pd.getString("PERSONNEL_TYPE_NAME"));
|
||||
userInfoService.editPractitioner(pd);
|
||||
|
||||
List<String> filePaths = new ArrayList<>();
|
||||
|
|
Loading…
Reference in New Issue