小虎：页面小细节处理（未处理完待续）

infosouth-admin/.settings/org.eclipse.core.resources.prefs

@@ -5,5 +5,5 @@ encoding//src/main/resources/static/css/login.css=UTF-8
 encoding//src/main/resources/static/ruoyi/css/ry-ui.css=UTF-8
 encoding//src/main/resources/templates/arj21/csvmanager/add.html=UTF-8
 encoding//src/main/resources/templates/arj21/csvmanager/edit.html=UTF-8
-encoding//src/main/resources/templates/arj21/csvmanager/flight.html=UTF-8
+encoding//src/main/resources/templates/arj21/csvmanager/qarDataExport.html=UTF-8
 encoding/<project>=UTF-8

infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html

@@ -26,9 +26,9 @@
                             </li>
                             <li>
                                 <p>机型：</p>
-                                <select name="acType" th:with="type=${@dict.getType('')}">
+                                <select name="acType" >
                                     <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    <option th:each="actype,status:${acTypeList}" th:text="${actype}" th:value="${actype}"></option>
                                 </select>
                             </li>
                             <li>
@@ -62,10 +62,11 @@
                                 <input type="text" name="fileSize"/>
                             </li>
                             <li>
-                                <p>操作类型--导入，导出：</p>
+                                <p>操作类型</p>
-                                <select name="operateType" th:with="type=${@dict.getType('')}">
+                                <select name="operateType">
                                     <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    <option value="">导入</option>
+                                    <option value="">导出</option>
                                 </select>
                             </li>
                             <li>
@@ -74,10 +75,7 @@
                             </li>
                             <li>
                                 <p>失败原因：</p>
-                                <select name="failType" th:with="type=${@dict.getType('')}">
+ 								<input type="text" name="failType"/>
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -178,7 +176,7 @@
                 },
                 {
                     field : 'operateType', 
-                    title : '操作类型--导入，导出'
+                    title : '操作类型'
                 },
                 {
                     field : 'isSucce', 

infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html

@@ -17,56 +17,38 @@
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endFlDate]"/>
                             </li>
                             <li>
-                                <p>航班号：</p>
+                                <p>机型：</p>
-                                <input type="text" name="flNo"/>
+                                <select name="acType" >
+                                    <option value="">所有</option>
+                                    <option th:each="actype,status:${acTypeList}" th:text="${actype}" th:value="${actype}"></option>
+                                </select>
                             </li>
                             <li>
                                 <p>飞机号：</p>
                                 <input type="text" name="arn"/>
                             </li>
-                            <li>
-                                <p>机型：</p>
-                                <select name="acType" th:with="type=${@dict.getType('')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
                             <li>
                                 <p>起飞机场：</p>
                                 <input type="text" name="pod"/>
                             </li>
                             <li>
-                                <p>到达机场：</p>
+                                <p>落地机场：</p>
                                 <input type="text" name="poa"/>
                             </li>
-                            <li>
+                            
-                                <p>所属公司：</p>
-                                <input type="text" name="airline"/>
-                            </li>
-                            <li>
-                                <p>资源目录ID：</p>
-                                <input type="text" name="infoResourceId"/>
-                            </li>
-                            <li class="select-time">
-                                <p>创建时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateDate]"/>
-                            </li>
-                            <li class="select-time">
-                                <p>更新时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateDate]"/>
-                            </li>
-                            <li>
-                                <p>备注：</p>
-                                <input type="text" name="remarks"/>
-                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
+                           <!--  <li>
+                            	<p>导出类型：</p>
+                            	 <select name="exportType" >
+                                    <option value="csv">csv</option>
+                                    <option value="xml">xml</option>
+                                    <option value="txt">txt</option>
+                                 </select>
+                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;</a>
+                            </li> -->
                         </ul>
                     </div>
                 </form>
@@ -114,12 +96,8 @@
                     visible: false
                 },
                 {
-                    field : 'flDate', 
+                    field : 'csvName', 
-                    title : '航班日期'
+                    title : 'csv文件名'
-                },
-                {
-                    field : 'flNo', 
-                    title : '航班号'
                 },
                 {
                     field : 'arn', 
@@ -129,6 +107,10 @@
                     field : 'acType', 
                     title : '机型'
                 },
+                {
+                    field : 'flDate', 
+                    title : '航班日期'
+                },
                 {
                     field : 'pod', 
                     title : '起飞机场'
@@ -137,35 +119,12 @@
                     field : 'poa', 
                     title : '到达机场'
                 },
-                {
-                    field : 'airline', 
-                    title : '所属公司'
-                },
-                {
-                    field : 'csvPath', 
-                    title : 'csv存储路径'
-                },
-                {
-                    field : 'csvName', 
-                    title : 'csv文件名'
-                },
-                {
-                    field : 'infoResourceId', 
-                    title : '资源目录ID'
-                },
                 {
                     field : 'createDate', 
-                    title : '创建时间'
+                    title : '导入时间'
-                },
+                }
-                {
+               
-                    field : 'updateDate', 
+               /*  {
-                    title : '更新时间'
-                },
-                {
-                    field : 'remarks', 
-                    title : '备注'
-                },
-                {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
@@ -174,7 +133,8 @@
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
-                }]
+                } */
+                ]
             };
             $.table.init(options);
         });

infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html

@@ -101,7 +101,8 @@
 	    			$("#progressBar").append("<li style='list-style-type:none;'><span class='filename'>"+efileName+"</span><div class='progress'> <div id='"+m+"barj' class='progress-bar progress-bar-info' role='progressbar' aria-valuemin='0' aria-valuenow='0' aria-valuemax='100' style='width: 0%'></div></div></li>");
 	    		} */
 	    		//填充table
-	    		tbody_html = "";
+	    		tbody_html = ""
+	    		var loginName = "";//上传用户名
 	    		for(var m=0;m<ss.length;m++){ //循环添加进度条	    			
 	    			efileName = ss[m].name ;
 	    			var efileNameArr = efileName.split('_');
@@ -133,6 +134,7 @@
 	    				success: function(data){
 	    					if(data.status=='1001'){
 	    						tbody_html +=''+data.data;
+	    						loginName = data.loginName;
 	    					}else{
 	    						alert('上传出错，请稍后再试！')
 	    						return;
@@ -164,7 +166,7 @@
 	    			tbody_html += "</td>";
 	    			tbody_html += "<td>";
 					//上传人
-					tbody_html +='';
+					tbody_html += loginName;
 	    			tbody_html += "</td>";
 	    			tbody_html += "<td class=\"td_time_"+m+"\">";
 					//上传时间

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.infosouth.arj21.domain.InfoFlight;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
 import cn.com.infosouth.arj21.service.IInfoFlightService;
 import cn.com.infosouth.common.annotation.Log;
 import cn.com.infosouth.common.core.controller.BaseController;
@@ -22,6 +24,7 @@ import cn.com.infosouth.common.core.domain.AjaxResult;
 import cn.com.infosouth.common.core.page.TableDataInfo;
 import cn.com.infosouth.common.enums.BusinessType;
 import cn.com.infosouth.common.utils.poi.ExcelUtil;
+import cn.com.infosouth.framework.util.ShiroUtils;
 
 /**
  * 航班信息Controller
@@ -36,11 +39,16 @@ public class InfoFlightController extends BaseController {
 
 	@Autowired
 	private IInfoFlightService infoFlightService;
+	@Autowired
+	private IInfoAcTypeService infoAcTypeService;
 
 	@RequiresPermissions("arj21:flight:view")
 	@GetMapping()
-	public String flight() {
+	public String flight(Model model) {
-		return prefix + "/flight";
+		
+		List<String> acTypeList = infoAcTypeService.findacTpyeList();
+		model.addAttribute("acTypeList", acTypeList);
+		return prefix + "/qarDataExport";
 	}
 
 	/**   
@@ -57,6 +65,7 @@ public class InfoFlightController extends BaseController {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("status", "1001");
 		map.put("data", "");
+		map.put("loginName", ShiroUtils.getLoginName());
 		//String info_ac_type_id = "";
 		String acType = "";
 		try {

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.infosouth.arj21.domain.InfoImexportLog;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
 import cn.com.infosouth.arj21.service.IInfoImexportLogService;
 import cn.com.infosouth.common.annotation.Log;
 import cn.com.infosouth.common.core.controller.BaseController;
@@ -37,11 +39,15 @@ public class InfoImexportLogController extends BaseController
 
     @Autowired
     private IInfoImexportLogService infoImexportLogService;
+    @Autowired
+    private IInfoAcTypeService infoAcTypeService;
     
     @RequiresPermissions("arj21:csvexport:view")
     @GetMapping()
-    public String csvexport()
+    public String csvexport(Model model)
     {
+    	List<String> acTypeList = infoAcTypeService.findacTpyeList();
+		model.addAttribute("acTypeList", acTypeList);
         return prefix + "/csvexport";
     }
 

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java

@@ -62,4 +62,6 @@ public interface InfoAcTypeMapper
     public int deleteInfoAcTypeByIds(String[] ids);
 
 	public List<Map<String, String>> findacTpyeMapList();
+
+	public List<String> findacTpyeList();
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java

@@ -66,4 +66,10 @@ public interface IInfoAcTypeService
      * @return
      */
 	public List<Map<String, String>> findacTpyeMapList();
+
+	/**
+	 * 查找机型列表
+	 * @return
+	 */
+	public List<String> findacTpyeList();
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java

@@ -98,4 +98,9 @@ public class InfoAcTypeServiceImpl implements IInfoAcTypeService
 	public List<Map<String, String>> findacTpyeMapList() {
 		return infoAcTypeMapper.findacTpyeMapList();
 	}
+
+	@Override
+	public List<String> findacTpyeList() {
+		return infoAcTypeMapper.findacTpyeList();
+	}
 }

infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml

@@ -99,4 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     
+    <select id="findacTpyeList" resultType="String">
+		SELECT 
+			b.ac_tpye
+		FROM info_ac_type b
+		<where>
+			b.del_flag = 0
+		</where>	
+		ORDER BY b.ac_tpye
+	</select>
+	
 </mapper>

infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml

@@ -27,24 +27,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<sql id="infoFlightColumns">
 		a.id AS "id",
-		a.fl_date AS "flDate",
+		a.fl_date AS "fl_date",
-		a.fl_no AS "flNo",
+		a.fl_no AS "fl_no",
 		<!-- a.arn AS "arId", -->
 		c.ac_reg AS "arn",
 		<!-- a.ac_type AS "acTypeId", -->
-		d.ac_tpye AS "acType",
+		d.ac_tpye AS "ac_type",
 		a.pod AS "pod",
 		a.poa AS "poa",
 		a.airline AS "airline",
-		a.csv_path AS "csvPath",
+		a.csv_path AS "csv_path",
-		a.csv_name AS "csvName",
+		a.csv_name AS "csv_name",
 		a.create_by AS "createBy.id",
-		a.info_resource_id AS "infoResourceId",
+		a.info_resource_id AS "info_resource_id",
-		a.create_date AS "createDate",
+		a.create_date AS "create_date",
 		a.update_by AS "updateBy.id",
-		a.update_date AS "updateDate",
+		a.update_date AS "update_date",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag"
+		a.del_flag AS "del_flag"
 	</sql>
 	<sql id="infoFlightJoins">
 		left join info_resource b 
@@ -60,7 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectInfoFlightList" parameterType="InfoFlight" resultMap="InfoFlightResult">
-        <include refid="selectInfoFlightVo"/>
+       	select
+        <include refid="infoFlightColumns"/>
+        from info_flight a
+      		left join info_aircraft c
+			on a.arn = c.id
+			left join info_ac_type d
+			on a.ac_type = d.id
         <where>  
             <if test="flDate != null "> and fl_date = #{flDate}</if>
             <if test="flNo != null  and flNo != ''"> and fl_no = #{flNo}</if>