李剑-节假日信息维护功能开发-增加了删除操作。

src/main/java/platform/common/base/service/BaseService.java

@@ -10,6 +10,7 @@ import platform.common.base.model.BaseEntity;
 import platform.common.base.model.Template;
 import platform.common.util.DateUtil;
 import platform.common.util.ShiroUtils;
+import platform.modules.sys.entity.SysConfig;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.Date;
@@ -249,4 +250,5 @@ public abstract class BaseService<T extends BaseEntity> {
         return SecureUtil.md5().digestHex(pass.trim());
     }
 
+
 }

src/main/java/platform/modules/government/web/SupermeController.java

@@ -1085,10 +1085,11 @@ public class SupermeController extends BaseController {
 	}
 
 
-	@OperationLog(value = "节假日信息删除")
+	@OperationLog(value = "节假日信息【物理】删除")
 	@ResponseBody
 	@DeleteMapping(value = "/holiday/delete/{id}")
 	public ResponseMessage deleteHoliday(@PathVariable("id") int id) {
+		/*
 		SysConfig ent2Del = sysConfigService.findById(id);
 		if (null == ent2Del) {
 			return ResponseMessage.error("未找到相应的假日信息");
@@ -1096,6 +1097,10 @@ public class SupermeController extends BaseController {
 		ent2Del.setDel_flag(true);
 		sysConfigService.update(ent2Del);
 
+		 */
+
+		sysConfigService.deleteById(id);
+
 		return ResponseMessage.success("删除成功！");
 	}
 

src/main/java/platform/modules/sys/service/SysConfigService.java

@@ -66,6 +66,7 @@ public class SysConfigService extends BaseService<SysConfig> {
         return this.findOne(sysConfig);
     }
 
+
     public String getYearWorkDay(String year) {
         SysConfig configEntity = getByYear(year);
         if (CommonUtils.isNull(configEntity)) {

src/main/resources/static/js/super/holiday/holiday_add.js

@@ -20,7 +20,7 @@ $(function () {
             },
             configName: {
                 minlength: 1,
-                maxlength: 20
+                maxlength: 40
             }
         },
         messages: {

src/main/resources/templates/admin/super/holiday/holiday_add.html

@@ -14,7 +14,7 @@
 		<div class="row cl">
 			<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>名称：</label>
 			<div class="formControls col-xs-8 col-sm-9">
-				<input type="text" class="input-text" required value="" th:value="${configName}"  th:id="configName" th:name="configName"/>
+				<input type="text" class="input-text" maxlength="40" required value="" th:value="${configName}"  th:id="configName" th:name="configName"/>
 			</div>
 		</div>
 		<div class="row cl">

src/main/resources/templates/admin/super/holiday/holiday_list.html

@@ -18,12 +18,7 @@
 
 <form id="myForm" th:action="@{/super/holidayList}" th:method="get">
     <div class="page-container">
-	    <!-- <div class="text-c">
-	            <input type="text" class="input-text" style="width:250px" placeholder="请输入关键字搜索" name="keyword" th:value="${keyword}"/>
-	            <button type="submit" class="btn btn-primary">
-	                搜索
-	            </button>
-	     </div> -->
+
         <div class="cl pd-5 bg-1 bk-gray mt-20">
             <span class="l">
                 <a href="javascript:;" th:onclick="'javascript:holiday_add(\'新增假日信息\',\'/super/holiday/add\',\'800\',\'500\');'" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i>新增</a>
@@ -48,12 +43,7 @@
                 <td th:text="*{configValue}"></td>
                 <td class="td-manage">
                     <a title="修改" href="javascript:;"  th:onclick="'javascript:holiday_edit(\'修改假日数据\',\'/super/holiday/edit/'+*{id}+'\',\'800\',\'500\');'" class="ml-5" style="text-decoration:none">修改</a>
-                    <!--
-                    // 这里的逻辑删除，会造成麻烦：
-                    //  因为configKey是再数据库里去重的，所以逻辑删除的configKey（比如：year_2023），一样不可用了
-                    //  且用户也看不到这个configKey（逻辑删除了，列表里不显示）
-                    -->
-                    <!--<a title="废弃" href="javascript:;"  th:onclick="'javascript:holiday_del(\'/super/holiday/delete/'+*{id}+'\');'" class="ml-5" style="text-decoration:none">废弃</a>-->
+                    <a title="删除" href="javascript:;"  th:onclick="'javascript:holiday_del(\'/super/holiday/delete/'+*{id}+'\');'" class="ml-5" style="text-decoration:none">删除</a>
                 </td>
             </tr>
             </tbody>