修改接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

 package com.yeejoin.amos.boot.biz.common.entity;
 
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import lombok.Data;
 
 /**
@@ -9,11 +15,18 @@ import lombok.Data;
  * @author DELL
  */
 @Data
-public class BaseEntity extends org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity {
+public class BaseEntity{
+	
+	    @TableId(value = "SEQUENCE_NBR" , type = IdType.ID_WORKER)
+	    protected Long sequenceNbr;
 
-    /**
-     * 是否删除
-     */
-    @TableField(value = "is_delete")
-    private boolean isDelete;
+	    @TableField(value = "REC_DATE",fill=FieldFill.INSERT_UPDATE )
+	    protected Date recDate;
+	    @TableField(value = "REC_USER_ID",fill=FieldFill.INSERT_UPDATE )
+	    protected String recUserId;
+	    /**
+	     * 是否删除
+	     */
+	    @TableField(value = "is_delete")
+	    private boolean isDelete;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

@@ -128,7 +128,7 @@ public class FireTeamController extends BaseController {
      	Collection<FireTeam> list =iFireTeamService.listByMap(columnMap);
      	FireTeam ll=new FireTeam();
      	 //List<Menu> menus=TreeParser.getTree(null,list);  
-         List<Menu> menus= TreeParser.getTree(null, list,  FireTeam.class.getName(),"getSequenceNbr",3, "getName", "getParent");
+         List<Menu> menus= TreeParser.getTree(null, list,  FireTeam.class.getName(),"getSequenceNbr",2, "getName", "getParent");
          return CommonResponseUtil.success(menus);  	
      }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
+
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
@@ -26,6 +25,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -66,9 +66,12 @@ public class FirefightersContractController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
-    	iFirefightersContractService.update(new UpdateWrapper<FirefightersContract>().eq("sequence_nbr", id).set("is_delete", 1));
-
+    public ResponseModel deleteById(HttpServletRequest request, @PathVariable String id){
+    	String str[] = id.split(",");
+    	 List<String> ids= Arrays.asList(str);
+    	for (String sequenceNbr : ids) {
+    	iFirefightersContractService.update(new UpdateWrapper<FirefightersContract>().eq("sequence_nbr", Long.valueOf(sequenceNbr)).set("is_delete", 1));
+		}
     	return CommonResponseUtil.success();
     }
 
@@ -123,6 +126,7 @@ public class FirefightersContractController extends BaseController {
 
         Page<FirefightersContract> pageBean;
         QueryWrapper<FirefightersContract> firefightersContractQueryWrapper = new QueryWrapper<>();
+        firefightersContractQueryWrapper.eq("is_delete", 0);
         Class<? extends FirefightersContract> aClass = firefightersContract.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersThoughtController.java

@@ -25,6 +25,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -62,8 +63,12 @@ public class FirefightersThoughtController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
-    	iFirefightersThoughtService.update(new UpdateWrapper<FirefightersThought>().eq("sequence_nbr", id).set("is_delete", 1));
+    public ResponseModel deleteById(HttpServletRequest request, @PathVariable String id){
+    	String str[] = id.split(",");
+   	    List<String> ids= Arrays.asList(str);
+     	for (String sequenceNbr : ids) {
+        iFirefightersThoughtService.update(new UpdateWrapper<FirefightersThought>().eq("sequence_nbr", Long.valueOf(sequenceNbr)).set("is_delete", 1));
+		}
     	return CommonResponseUtil.success();
 
     }
@@ -116,6 +121,7 @@ public class FirefightersThoughtController extends BaseController {
 
         Page<FirefightersThought> pageBean;
         QueryWrapper<FirefightersThought> firefightersThoughtQueryWrapper = new QueryWrapper<>();
+        firefightersThoughtQueryWrapper.eq("is_delete", 0);
         Class<? extends FirefightersThought> aClass = firefightersThought.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {