bf

yiming
1 parent 38764770
Showing 8 changed files with 77 additions and 45 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineExamineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.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/lineHistory/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
 package com.ruoyi.project.system.line.controller;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.security.ShiroUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.dict.domain.DictData;
+
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
-import com.ruoyi.project.system.user.domain.User;
+
 import com.ruoyi.project.system.user.service.IUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,13 +16,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
+
 import java.util.List;
-import java.util.Map;
+
 /**
  * 【请填写功能名称】Controller
@@ -47,8 +40,7 @@ public class BsthTLineExamineController extends BaseController
     IDictDataService dictDataService;
-    @Autowired
-    private IUserService userService;
+
     @RequiresPermissions("system:line:view")
     @GetMapping()
@@ -86,6 +86,9 @@ public class BsthTLineHistoryController extends BaseController
         if(bsthTLineExamine!=null){
             bsthTLine=bsthTLineExamine;
         }
+        bsthTLine.setUpdateStatus("1");
+        boolean flag=bsthTLineService.selectHistoryByLineNameAndUpdateStatus(bsthTLine)!=null?true:false;
+        mmap.put("flag",flag);
         mmap.put("bsthTLine", bsthTLine);
         return prefix + "/edit";
     }
@@ -99,17 +102,30 @@ public class BsthTLineHistoryController extends BaseController
     @ResponseBody
     public AjaxResult editSave(BsthTLine bsthTLine)
     {
+        AjaxResult ajaxResult;
         User loginUser = ShiroUtils.getSysUser();
         bsthTLine.setUpdateBy(loginUser.getUserName());
         String lineName=bsthTLine.getLineName();
+
         BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
         if(bsthTLineExamine!=null){//有没审核的直接覆盖
             bsthTLine.setId(bsthTLineExamine.getId());
-            return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
+            ajaxResult= toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
         }else {//没有新增
             bsthTLine.setExamineType("1");
-            return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
+            ajaxResult= toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
+        }
+        BsthTLine bl=new BsthTLine();
+        bl.setLineName(lineName);
+        bl.setUpdateStatus("1");
+
+        //重复提交删除上一次通过未执行的申请
+        bl=bsthTLineService.selectHistoryByLineNameAndUpdateStatus(bl);
+        if(bl!=null){
+            bsthTLineService.deleteBsthTLineHistoryById(bl.getId());
         }
+
+        return ajaxResult;
     }
@@ -55,7 +55,7 @@ public interface BsthTLineMapper
 	List<BsthTLine> findNeedUpdateHistory();
-	BsthTLine historyIsExist(String lineName);
+	BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
 	int insertLineEditRepot(LineEditReport lineEditReport);
@@ -67,6 +67,7 @@ public interface BsthTLineMapper
 	List<BsthTLine> selectHistoryListNotUpdate(BsthTLine bsthTLine);
+	int deleteBsthTLineHistoryById(Long id);
 	/*int createLineMonthReport(BsthTLine line);*/
@@ -41,12 +41,6 @@ public interface IBsthTLineService
 	List<BsthTLine> getListByName(String object);
-
-
-
-
-
-
 	List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine);
 	int insertBsthTLineExamine(BsthTLine bsthTLine);
@@ -55,7 +49,6 @@ public interface IBsthTLineService
 	int updateBsthTLineExamine(BsthTLine bsthTLine);
-
 	int deleteBsthTLineExamineById(String ids);
 	int examine(BsthTLine bsthTLine);
@@ -64,5 +57,8 @@ public interface IBsthTLineService
 	boolean lineNameIsExist(String lineName);
+	BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
+
+	int deleteBsthTLineHistoryById(Long id);
 	/*int createLineMonthReport();*/
 }
@@ -262,15 +262,16 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 			lineEditReport.setVehiclesNumberBefore(line.getVehiclesNumber());
 			lineEditReport.setNumberPersonBefore(line.getNumberPerson());
-			//判断是否当前记录
-			BsthTLine bl=bsthTLineMapper.historyIsExist(line.getLineName());
-			if(bl!=null){//存在改为历史
-				bl.setUpdateStatus("-1");
-				bsthTLineMapper.updateBsthTLineHistory(bl);
-			}else {//不存在把运营数据插入
-				bl.setUpdateStatus("-1");
-				bsthTLineMapper.saveEditHistory(line);
-			}
+
+			BsthTLine bl=new BsthTLine();
+			bl.setLineName(history.getLineName());
+			bl.setUpdateStatus("0");
+			bl=bsthTLineMapper.selectHistoryByLineNameAndUpdateStatus(bl);
+			//修改状态 当前->历史
+			bl.setUpdateStatus("-1");
+			bsthTLineMapper.updateBsthTLineHistory(bl);
+
+
 			//更新运营数据
 			Date d = new Date();
@@ -371,9 +372,12 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		if(bsthTLine.getId()!=null){
 			if("0".equals(bsthTLine.getExamineType())){//新增
 				if("2".equals(bsthTLine.getExamineStatus())){//通过
-					//存入主表
+					//存入主表和历史表
 					bl=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
+					bl.setUpdateStatus("0");
+					bsthTLineMapper.saveEditHistory(bl);
 					i=bsthTLineMapper.insertBsthTLine(bl);
+
 					//删除审核表
 					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bsthTLine.getId().toString()});
 				}else{//未通过
@@ -428,4 +432,14 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		return flag;
 	}
+	@Override
+	public BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine){
+		return bsthTLineMapper.selectHistoryByLineNameAndUpdateStatus(bsthTLine);
+	}
+
+	@Override
+	public int deleteBsthTLineHistoryById(Long id){
+		return bsthTLineMapper.deleteBsthTLineHistoryById(id);
+	}
+
 }
@@ -1443,10 +1443,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
-	<select id="historyIsExist" parameterType="String"
+	<select id="selectHistoryByLineNameAndUpdateStatus" parameterType="BsthTLine"
 			resultMap="BsthTLineResult">
 		<include refid="selectBsthTLineHistoryVo" />
-		where line_name= #{lineName} and update_status='0'
+		where line_name= #{lineName} and update_status=#{updateStatus}
 	</select>
@@ -1695,6 +1695,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		</where>
 	</select>
+	<delete id="deleteBsthTLineHistoryById" parameterType="Long">
+		delete from bsth_t_line_history where id=#{id}
+	</delete>
 <!--
@@ -507,7 +507,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">低谷系数：</label>
 				<div class="col-sm-8">
-					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}"
+					<input name="lowCustomerPercent" id="lowCustomerPercent" th:field="*{lowCustomerPercent}"
 						class="form-control" type="text">
 				</div>
 			</div>
@@ -682,7 +682,7 @@
 	<th:block th:include="include :: bootstrap-fileinput-js" />
 	<script th:inline="javascript">
 		var prefix = ctx + "system/lineHistory";
-
+		var f=[[${flag}]];
 		$(function() {
 			/* $.get("/system/line/getUserLineInfo",function(data){
 				if(data.msg != null){
@@ -751,12 +751,10 @@
 								var bsthTLineOld=data[0];
 								var bsthTLineNew=data[1];
 								if(bsthTLineNew!=null){
-									console.log(bsthTLineNew)
 									for(let i  in bsthTLineOld){
 										var o=bsthTLineOld[i]==null?'':bsthTLineOld[i];
 										var n=bsthTLineNew[i]==null?'':bsthTLineNew[i];
 										if(o!=n){
-											console.log(i)
 											i=i=='fcompany'?'fCompany':i;
 											i=i=='plineId'?'pLineId':i;
 											var input=document.getElementsByName(i)[0];
@@ -882,6 +880,8 @@
 			minView : "month",
 			autoclose : true
 		});
+
+
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -62,10 +62,6 @@
 	<script th:inline="javascript">
-		function add(obj){
-			if($(obj)[0].className.indexOf("disabled") == -1)
-				$.operate.add();
-		}
 		new Vue({
 			el: '#context',
@@ -498,9 +494,23 @@
 				btn: ['变更', '返回'],
 				// 弹层外区域关闭
 				shadeClose: true,
-				yes: callback
+				yes: function(index, layero){
+					var iframe = window["layui-layer-iframe" + index];
+					if(iframe.f==true){
+						layer.confirm("存在待执行的申请,是否重新申请",{
+							btn: ['是', '否']
+						},function (index, layero) {
+							iframe.submitHandler(index, layero);
+							layer.close(index);
+						});
+					}else {
+						iframe.submitHandler(index, layero);
+					}
+				},
 			});
+
 		}
+
 	</script>
 	<style>
 .col_checkbox {