bf

yiming
1 parent 146db63b
Showing 7 changed files with 116 additions and 63 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
@@ -97,6 +97,12 @@ public class BsthTLineAddController extends BaseController
     {
         User loginUser = ShiroUtils.getSysUser();
         bsthTLine.setCreateBy(loginUser.getUserName());
+        if(!bsthTLineService.lineNameIsExist(bsthTLine.getLineName())){
+            AjaxResult ajaxResult=new AjaxResult();
+            ajaxResult.put("code","96");
+            ajaxResult.put("msg","线路已存在或提交申请");
+            return ajaxResult;
+        }
         return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
     }
@@ -133,7 +139,14 @@ public class BsthTLineAddController extends BaseController
-
+    @RequiresPermissions("system:line:remove")
+    @Log(title = "线路删除", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bsthTLineService.deleteBsthTLineExamineById(ids));
+    }
 }
@@ -113,4 +113,6 @@ public interface BsthTLineMapper
 	int deleteBsthTLineExamineById(String[] ids);
 	BsthTLine selectBsthTLineExamineByLineName(String lineName);
+
+	BsthTLine selectBsthTLineByLineName(String lineName);
 }
@@ -118,4 +118,6 @@ public interface IBsthTLineService
 	int examine(BsthTLine bsthTLine);
 	BsthTLine selectBsthTLineExamineByLineName(String lineName);
+
+	boolean lineNameIsExist(String lineName);
 }
@@ -432,4 +432,14 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	public BsthTLine selectBsthTLineExamineByLineName(String lineName){
 		return bsthTLineMapper.selectBsthTLineExamineByLineName(lineName);
 	}
+
+	@Override
+	public boolean lineNameIsExist(String lineName) {
+		boolean flag=true;
+		if(bsthTLineMapper.selectBsthTLineByLineName(lineName)!=null || bsthTLineMapper.selectBsthTLineExamineByLineName(lineName)!=null){
+			flag=false;
+		}
+		return flag;
+	}
+
 }
@@ -99,6 +99,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<result property="startDate" column="start_date" />
 		<result property="startReason" column="start_reason" />
 		<result property="nightParking" column="night_parking" />
+		<result property="files" column="files" />
+		<result property="startReason" column="start_reason" />
+		<result property="revenueType" column="revenue_type" />
 		<result property="updateStatus" column="update_status" />
 		<result property="lineUpdateType" column="line_update_type" />
 		<result property="examineStatus" column="examine_status" />
@@ -1616,7 +1619,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			   full_customer_percent, low_customer_percent, divide_level,
 			   has_timelists, is_metro, metro_time, cold_bonus_type, revenues_month,
 			   person_month, mileage_month, person_month_avg, revenues, persons,
-			   mileages, person_avg, start_date,night_parking,files,examine_status,examine_type,start_reason,line_update_type from bsth_t_line_examine
+			   mileages, person_avg, start_date,night_parking,files,revenue_type,examine_status,examine_type,start_reason,line_update_type from bsth_t_line_examine
 	</sql>
 	<select id="selectBsthTLineExamineList" parameterType="BsthTLine"
@@ -1793,6 +1796,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="personAvg != null">person_avg,</if>
 			<if test="startDate != null">start_date,</if>
 			<if test="nightParking != null">night_parking,</if>
+			<if test="files != null">files,</if>
 			<if test="revenueType != null">revenue_type,</if>
 			<if test="examineType != null">examine_type,</if>
 			<if test="startReason != null">start_reason,</if>
@@ -1878,6 +1882,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="personAvg != null">#{personAvg},</if>
 			<if test="startDate != null">#{startDate},</if>
 			<if test="nightParking != null">#{nightParking},</if>
+			<if test="files != null">#{files},</if>
 			<if test="revenueType != null">#{revenueType},</if>
 			<if test="examineType != null">#{examineType},</if>
 			<if test="startReason != null">#{startReason},</if>
@@ -1976,12 +1981,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="startDate != null">start_date = #{startDate},</if>
 			<if test="nightParking != null">night_parking = #{nightParking},</if>
 			<if test="files != null">files = #{files},</if>
+			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="examineStatus != null">examine_status = #{examineStatus},</if>
 			<if test="startReason != null">start_reason = #{startReason},</if>
-			<if test="startDate != null">start_date = #{startDate},</if>
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
 			<if test="startReason != null">start_reason = #{startReason},</if>
-
 		</trim>
 		where id = #{id}
 	</update>
@@ -2001,4 +2005,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	where line_name= #{lineName}
 	</select>
+	<select id="selectBsthTLineByLineName" parameterType="String"
+			resultMap="BsthTLineResult">
+		<include refid="selectBsthTLineVo" />
+		where line_name= #{lineName}
+	</select>
+
 </mapper>
 \ No newline at end of file
@@ -3,6 +3,7 @@
 <head>
     <th:block th:include="include :: header('添加线路档案信息')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-fileinput-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -224,7 +225,7 @@
                     <textarea name="remark" class="form-control"></textarea>
                 </div>
             </div>
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">是否逻辑删除：</label>
                 <div class="col-sm-8">
                     <select name="isLogicDelete"
@@ -236,7 +237,7 @@
                         </option>
                     </select>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-3 control-label">更新人：</label>
                 <div class="col-sm-8">
@@ -516,74 +517,55 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
-                <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
+                <div class="col-sm-8">
+                    <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
                         class="form-control m-b">
-                    <option value=""></option>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                             th:value="${dict.dictValue}"></option>
-                </select>
+                    </select>
+                </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">轨交时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="metroTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="metroTime" class="form-control"
+                               placeholder="HH:mm:ss" > <span
+                            class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
                 <div class="col-sm-8">
-                    <input name="coldBonusType" lass="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">月度营收：</label>
-                <div class="col-sm-8">
-                    <input name="revenuesMonth" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">月度人次：</label>
-                <div class="col-sm-8">
-                    <input name="personMonth" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">月度里程：</label>
-                <div class="col-sm-8">
-                    <input name="mileageMonth" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">百公里人次：</label>
-                <div class="col-sm-8">
-                    <input name="personMonthAvg" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">营收：</label>
-                <div class="col-sm-8">
-                    <input name="revenues" class="form-control" type="text">
+                    <input name="coldBonusType" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">人次：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">性质：</label>
                 <div class="col-sm-8">
-                    <input name="persons" class="form-control" type="text">
+                    <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b">
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">里程：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">营收类型：</label>
                 <div class="col-sm-8">
-                    <input name="mileages" class="form-control" type="text">
+                    <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">百公里人次：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">附件：</label>
                 <div class="col-sm-8">
-                    <input name="personAvg" class="form-control" type="text">
+                    <div class="file-loading" id="uploadDiv">
+                        <input id="fileinput" type="file" multiple>
+                    </div>
                 </div>
             </div>
             <div class="form-group">    
@@ -599,8 +581,36 @@
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/lineAdd"
+
+        $(function() {
+
+            $("#fileinput").fileinput({
+                'theme' : 'explorer-fas',
+                'uploadUrl' : '/common/upload',
+                overwriteInitial : false,
+                initialPreviewAsData : false
+            });
+
+            $("#fileinput").on("fileuploaded",
+                function(event, data, proviewId, index) {
+
+                    var obj = '<div><input name="files" type="hidden" value='+data.files[index].name + ':' + data.response.url + '>'+
+                        '<a href='+data.response.url+'>'+ data.files[index].name +
+                        '</a><button onclick="deleteFile(this);">删除</button></div>';
+
+
+                    $(".file-input").before(obj);
+
+                });
+        })
+
+        function deleteFile(obj){
+            $(obj).parent().remove();
+        }
+
         $("#form-line-add").validate({
             rules:{
                 isWarrantStartTime:{
@@ -666,12 +676,6 @@
             autoclose: true
         });
-        $("input[name='metroTime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
         $("input[name='startDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
@@ -590,7 +590,7 @@
 						class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">
+			<!--<div class="form-group">
 				<label class="col-sm-3 control-label">月度营收：</label>
 				<div class="col-sm-8">
 					<input name="revenuesMonth" th:field="*{revenuesMonth}"
@@ -645,7 +645,7 @@
 					<input name="personAvg" th:field="*{personAvg}"
 						class="form-control" type="text">
 				</div>
-			</div>
+			</div>-->
 			<div class="form-group">
 				<label class="col-sm-3 control-label">启用时间：</label>
@@ -660,6 +660,7 @@
 				</div>
 			</div>
+
 			<div class="form-group">
 				<label class="col-sm-3 control-label">性质：</label>
 				<div class="col-sm-8">
@@ -667,14 +668,25 @@
 						th:with="type=${@dict.getType('lineUpdateType')}"
 						class="form-control m-b">
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"></option>
+							th:value="${dict.dictValue}"
+							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">营收类型：</label>
+				<div class="col-sm-8">
+					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
 					</select>
 				</div>
 			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">启用原因：</label>
 				<div class="col-sm-8">
-					<textarea name="startReason" class="form-control"></textarea>
+					<textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
 				</div>
 			</div>
 			<div class="form-group">