'修改班次'

.idea/workspace.xml

@@ -26,51 +26,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="针对退款时将所有的订单信息进行退款2021-10-15">
-      <change afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/ShiftClass.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IShiftMaskService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/ShiftMaskServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/mapper/ShiftMaskMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar/SAAS-AFTEREND2.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/ShiftClassController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/ShiftClassController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/ShiftClass.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/ShiftMaskMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IShiftMaskService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/ShiftMaskServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/ShiftClassMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -144,9 +109,8 @@
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="com.yijia.station.service" />
-      <recent name="com.yijia.station.controller" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\resources\mapper\station" />
@@ -162,8 +126,9 @@
       <recent name="com.yijia.station.mapper" />
       <recent name="com.yijia.station.domain" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.yijia.station.service" />
+      <recent name="com.yijia.station.controller" />
     </key>
   </component>
   <component name="RunAnythingCache">
@@ -343,7 +308,8 @@
       <workItem from="1664329975655" duration="15398000" />
       <workItem from="1665190910176" duration="2359000" />
       <workItem from="1665277043309" duration="10334000" />
-      <workItem from="1665622771275" duration="2673000" />
+      <workItem from="1665622771275" duration="5158000" />
+      <workItem from="1665709084314" duration="5176000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -751,54 +717,54 @@
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="740" y="341" key="FileChooserDialogImpl/0.0.1920.1160@0.0.1920.1160" timestamp="1664420679024" />
-    <state width="1860" height="318" key="GridCell.Tab.0.bottom" timestamp="1665625069632">
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom" timestamp="1665716863878">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
-    <state width="1860" height="318" key="GridCell.Tab.0.center" timestamp="1665625069632">
+    <state width="1860" height="337" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
+    <state width="1860" height="337" key="GridCell.Tab.0.center" timestamp="1665716863878">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
-    <state width="1860" height="318" key="GridCell.Tab.0.left" timestamp="1665625069632">
+    <state width="1860" height="337" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
+    <state width="1860" height="337" key="GridCell.Tab.0.left" timestamp="1665716863878">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
-    <state width="1860" height="318" key="GridCell.Tab.0.right" timestamp="1665625069632">
+    <state width="1860" height="337" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
+    <state width="1860" height="337" key="GridCell.Tab.0.right" timestamp="1665716863878">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="318" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665625069632" />
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863878" />
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.1.center" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.1.left" timestamp="1665716863710">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863710" />
+    <state width="1860" height="337" key="GridCell.Tab.1.right" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.2.center" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.2.left" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
-    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665541319100">
+    <state width="1860" height="337" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right" timestamp="1665716863711">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665541319100" />
+    <state width="1860" height="337" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1665716863711" />
     <state x="461" y="231" key="SettingsEditor" timestamp="1663724002207">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>

yijia-station/src/main/java/com/yijia/station/controller/ShiftClassController.java

@@ -38,6 +38,7 @@ public class ShiftClassController extends BaseController
     {
 
         startPage();
+        shiftClass.setDelFlag("0");
         List<ShiftClass> shiftClassList = shiftMaskService.selectShiftClassList(shiftClass);
         shiftClassList.get(0).getCreateTime().getTime();
         return getDataTable(shiftClassList);
@@ -83,6 +84,20 @@ public class ShiftClassController extends BaseController
         return toAjax(shiftMaskService.updateShiftClass(shiftClass));
     }
 
-
+    /**
+     * 修改油站信息
+     */
+    @Log(title = "删除班次", businessType = BusinessType.UPDATE)
+    @PostMapping("deleteClass")
+    public AjaxResult deleteShift(@RequestBody  Long shiftClassId)
+    {
+        ShiftClass shiftClass=new ShiftClass();
+        LoginUser current=SecurityUtils.getLoginUser();
+        shiftClass.setShiftClassId(shiftClassId);
+        shiftClass.setUpdateTime(new Date());
+        shiftClass.setUpdateUser(current.getUser().getUserId());
+        shiftClass.setDelFlag("1");
+        return toAjax(shiftMaskService.updateShiftClass(shiftClass));
+    }
 
 }

yijia-system/src/main/resources/mapper/system/ShiftClassMapper.xml

@@ -66,7 +66,6 @@ FROM
             <if test="createUser != null">create_user,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateUser != null">update_user,</if>
-
             <if test="shiftMask != null">shift_mask,</if>
             <if test="delFlag != null">del_flag,</if>
 

yijia-station/target/classes/mapper/station/ShiftClassMapper.xml → yijia-system/target/classes/mapper/system/ShiftClassMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qujia.station.mapper.ShiftMaskMapper">
+<mapper namespace="com.yijia.system.mapper.ShiftMaskMapper">
     
     <resultMap type="ShiftClass" id="ShiftClassResult">
         <result property="shiftClassId"    column="shift_class_id"    />
@@ -66,7 +66,6 @@ FROM
             <if test="createUser != null">create_user,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateUser != null">update_user,</if>
-
             <if test="shiftMask != null">shift_mask,</if>
             <if test="delFlag != null">del_flag,</if>