预配 安检 excel 导入导出

@@ -5,10 +5,7 @@ import com.agent.entity.Constant;
 import com.agent.entity.agent.*;
 import com.agent.entity.system.UserEntity;
 import com.agent.service.agent.*;
-import com.agent.service.system.HzInfoService;
-import com.agent.service.system.HzWaybillService;
-import com.agent.service.system.RoleService;
-import com.agent.service.system.UserService;
+import com.agent.service.system.*;
 import com.agent.util.ExcelUtil;
 import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
@@ -115,6 +112,15 @@ public class ManifestController extends BasicController {
 	@Resource
     private HzWaybillService hzWaybillService;
 
+	@Resource
+	private SecurityDeclarationService securityDeclarationService;
+
+	@Resource
+	private SDCargoNameService sdCargoNameService;
+
+	@Resource
+	private SDCargoTypeService sdCargoTypeService;
+
 	private BasicAgentEntity getAgent() {
 		UserEntity user = Tools.getUserEntity();
 		long agent_id = user.getAgent();
@@ -2268,12 +2274,19 @@ public class ManifestController extends BasicController {
 
 
             for (ArrayList<String> arr: readResult) {
-
+				String wbm = "";
                 if (!StringUtils.isBlank(arr.get(1))){
+                	if(arr.get(1).contains("-")){
+
+                		wbm = arr.get(1);
+					}else {
 						String s1 = arr.get(1);
 						String substring = s1.substring(0, 3);
 						String substring1 = s1.substring(3);
-                    String wbm = substring+"-"+substring1;
+						wbm = substring+"-"+substring1;
+					}
+
+
                     //查询主单号时候存在
                     ManifestEntity wbm1 = manifestService.findWbm(wbm);
                     if (wbm1==null){
@@ -2350,12 +2363,68 @@ public class ManifestController extends BasicController {
 
                         //货物海关状态代码
                         manifestEntity.setCustomsstatus(arr.get(33));
+
+                        // 安检申报
+						SecurityDeclarationEntity sd = new SecurityDeclarationEntity();
+						sd.setSd_waybill(wbm);
+						// 航空货物托运人名称
+						sd.setSd_cargo_shipper_name(arr.get(34));
+						// 航空货物销售代理人名称
+						sd.setSd_cargo_agent_name(arr.get(35));
+						// 航协资质编号
+						if (!StringUtils.isBlank(arr.get(36))){
+							sd.setSd_iata_number(arr.get(36));
+						}
+
+						sd.setSd_static("1");
+						// 发布时间
+						SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						String format = simpleDateFormat2.format(new Date());
+						sd.setOperation_time(format);
+						// 运输条件鉴定书
+						if (!StringUtils.isBlank(arr.get(37))){
+
+							String certificate = arr.get(37);
+							if (certificate != null){
+								String s2 = certificate.replaceAll("，", ",");
+								sd.setSd_transportation_prove(s2);
+							}
+						}
+
+						// 航空公司同意运输证明
+						if (!StringUtils.isBlank(arr.get(38))){
+
+							String prove = arr.get(38);
+							if (prove != null){
+								String s2 = prove.replaceAll("，", ",");
+								sd.setSd_transportation_prove(s2);
+							}
+						}
+						// 用户ID
+						sd.setUSER_ID(userId);
+
+						// 航空货物性质
+						SDCargoTypeEntity sdCargoTypeEntity = new SDCargoTypeEntity();
+						sdCargoTypeEntity.setSd_waybill(wbm);
+						sdCargoTypeEntity.setSd_cargo_type(arr.get(39));
+						sdCargoTypeService.save(sdCargoTypeEntity);
+
+						// 航空货物品名
+						String[] cargoName = arr.get(40).replace("，",",").split(",");
+						for (int i = 0; i < cargoName.length; i++){
+							SDCargoNameEntity sdCargoNameEntity = new SDCargoNameEntity();
+							sdCargoNameEntity.setSd_waybill(wbm);
+							sdCargoNameEntity.setSd_cargo_name(cargoName[i]);
+							sdCargoNameService.save(sdCargoNameEntity);
+						}
+						securityDeclarationService.save(sd);
+
 						manifestService.save(manifestEntity);
                         model.setStatus(200);
                     }else {
                         model.setStatus(201);
                         model.setMsg(wbm1.getWaybillnomaster()+"单号已存在");
-                        continue;
+                        break;
                     }
                 }else {
                     break;

@@ -42,6 +42,6 @@ public interface SDTWOTYPERepository extends PagingAndSortingRepository<SDTWOTYP
     @Query(value = "DELETE FROM SD_TWO_TYPE WHERE TWO_TYPE_NAME = ?1", nativeQuery = true)
     int cargoNameDelete(String twoName);
 
-    @Query(value = "select * from (select stt.*, row_number() over(partition by stt.TWO_TYPE_NAME order by 1) rn from SD_TWO_TYPE stt) stt where stt.rn = 1", nativeQuery = true)
+    @Query(value = "select * from (select stt.*, row_number() over(partition by stt.TWO_TYPE_NAME order by 1) rn from SD_TWO_TYPE stt) stt where stt.rn = 1 ORDER BY stt.BIG_TYPE_ID", nativeQuery = true)
     List<SDTWOTYPEEntity> twoFindAll();
 }

@@ -62,7 +62,8 @@
 		                     <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
 		                     <a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>
 							 <%--<a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a> --%>
-                             <%--<a href="javascript:excelUpload()" class="easyui-linkbutton" style="background:#0EA14E;color:#FFF;border: 1px solid #18A197;"><spring:message code="manifest.excel"/></a>--%>
+                             <a href="javascript:excelUpload()" class="easyui-linkbutton" style="background:#0EA14E;color:#FFF;border: 1px solid #18A197;"><spring:message code="manifest.excel"/></a>
+                             <a href="<%=basePath %>resource/excel/excel.xls" class="easyui-linkbutton" style="background:#0EA14E;color:#FFF;border: 1px solid #18A197;">模板下载</a>
 		          	</table>
 	          	</form>
            </div>