diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/ComfortSoldierController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/ComfortSoldierController.java new file mode 100644 index 0000000..4c96631 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/ComfortSoldierController.java @@ -0,0 +1,72 @@ +package net.lab1024.sa.admin.module.business.village.controller; + +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.ComfortSoldierVO; +import net.lab1024.sa.admin.module.business.village.service.ComfortSoldierService; +import net.lab1024.sa.base.common.domain.ValidateList; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import cn.dev33.satoken.annotation.SaCheckPermission; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 优抚军人信息 Controller + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@RestController +@Tag(name = "优抚军人信息") +public class ComfortSoldierController { + + @Resource + private ComfortSoldierService comfortSoldierService; + + @Operation(summary = "分页查询 @author pengjie") + @PostMapping("/comfortSoldier/queryPage") + @SaCheckPermission("comfortSoldier:query") + public ResponseDTO> queryPage(@RequestBody @Valid ComfortSoldierQueryForm queryForm) { + return ResponseDTO.ok(comfortSoldierService.queryPage(queryForm)); + } + + @Operation(summary = "添加 @author pengjie") + @PostMapping("/comfortSoldier/add") + @SaCheckPermission("comfortSoldier:add") + public ResponseDTO add(@RequestBody @Valid ComfortSoldierAddForm addForm) { + return comfortSoldierService.add(addForm); + } + + @Operation(summary = "更新 @author pengjie") + @PostMapping("/comfortSoldier/update") + @SaCheckPermission("comfortSoldier:update") + public ResponseDTO update(@RequestBody @Valid ComfortSoldierUpdateForm updateForm) { + return comfortSoldierService.update(updateForm); + } + + @Operation(summary = "批量删除 @author pengjie") + @PostMapping("/comfortSoldier/batchDelete") + @SaCheckPermission("comfortSoldier:delete") + public ResponseDTO batchDelete(@RequestBody ValidateList idList) { + return comfortSoldierService.batchDelete(idList); + } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/comfortSoldier/delete/{soldierId}") + @SaCheckPermission("comfortSoldier:delete") + public ResponseDTO batchDelete(@PathVariable Long soldierId) { + return comfortSoldierService.delete(soldierId); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/DisabilitySoldierController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/DisabilitySoldierController.java new file mode 100644 index 0000000..08c1243 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/DisabilitySoldierController.java @@ -0,0 +1,72 @@ +package net.lab1024.sa.admin.module.business.village.controller; + +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.DisabilitySoldierVO; +import net.lab1024.sa.admin.module.business.village.service.DisabilitySoldierService; +import net.lab1024.sa.base.common.domain.ValidateList; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import cn.dev33.satoken.annotation.SaCheckPermission; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 伤残军人信息 Controller + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@RestController +@Tag(name = "伤残军人信息") +public class DisabilitySoldierController { + + @Resource + private DisabilitySoldierService disabilitySoldierService; + + @Operation(summary = "分页查询 @author pengjie") + @PostMapping("/disabilitySoldier/queryPage") + @SaCheckPermission("disabilitySoldier:query") + public ResponseDTO> queryPage(@RequestBody @Valid DisabilitySoldierQueryForm queryForm) { + return ResponseDTO.ok(disabilitySoldierService.queryPage(queryForm)); + } + + @Operation(summary = "添加 @author pengjie") + @PostMapping("/disabilitySoldier/add") + @SaCheckPermission("disabilitySoldier:add") + public ResponseDTO add(@RequestBody @Valid DisabilitySoldierAddForm addForm) { + return disabilitySoldierService.add(addForm); + } + + @Operation(summary = "更新 @author pengjie") + @PostMapping("/disabilitySoldier/update") + @SaCheckPermission("disabilitySoldier:update") + public ResponseDTO update(@RequestBody @Valid DisabilitySoldierUpdateForm updateForm) { + return disabilitySoldierService.update(updateForm); + } + + @Operation(summary = "批量删除 @author pengjie") + @PostMapping("/disabilitySoldier/batchDelete") + @SaCheckPermission("disabilitySoldier:delete") + public ResponseDTO batchDelete(@RequestBody ValidateList idList) { + return disabilitySoldierService.batchDelete(idList); + } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/disabilitySoldier/delete/{soldierId}") + @SaCheckPermission("disabilitySoldier:delete") + public ResponseDTO batchDelete(@PathVariable Long soldierId) { + return disabilitySoldierService.delete(soldierId); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/PromotionSoldierController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/PromotionSoldierController.java new file mode 100644 index 0000000..751ded9 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/PromotionSoldierController.java @@ -0,0 +1,72 @@ +package net.lab1024.sa.admin.module.business.village.controller; + +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.PromotionSoldierVO; +import net.lab1024.sa.admin.module.business.village.service.PromotionSoldierService; +import net.lab1024.sa.base.common.domain.ValidateList; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import cn.dev33.satoken.annotation.SaCheckPermission; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 提干军人信息 Controller + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@RestController +@Tag(name = "提干军人信息") +public class PromotionSoldierController { + + @Resource + private PromotionSoldierService promotionSoldierService; + + @Operation(summary = "分页查询 @author pengjie") + @PostMapping("/promotionSoldier/queryPage") + @SaCheckPermission("promotionSoldier:query") + public ResponseDTO> queryPage(@RequestBody @Valid PromotionSoldierQueryForm queryForm) { + return ResponseDTO.ok(promotionSoldierService.queryPage(queryForm)); + } + + @Operation(summary = "添加 @author pengjie") + @PostMapping("/promotionSoldier/add") + @SaCheckPermission("promotionSoldier:add") + public ResponseDTO add(@RequestBody @Valid PromotionSoldierAddForm addForm) { + return promotionSoldierService.add(addForm); + } + + @Operation(summary = "更新 @author pengjie") + @PostMapping("/promotionSoldier/update") + @SaCheckPermission("promotionSoldier:update") + public ResponseDTO update(@RequestBody @Valid PromotionSoldierUpdateForm updateForm) { + return promotionSoldierService.update(updateForm); + } + + @Operation(summary = "批量删除 @author pengjie") + @PostMapping("/promotionSoldier/batchDelete") + @SaCheckPermission("promotionSoldier:delete") + public ResponseDTO batchDelete(@RequestBody ValidateList idList) { + return promotionSoldierService.batchDelete(idList); + } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/promotionSoldier/delete/{soldierId}") + @SaCheckPermission("promotionSoldier:delete") + public ResponseDTO batchDelete(@PathVariable Long soldierId) { + return promotionSoldierService.delete(soldierId); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/RetireSoldierController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/RetireSoldierController.java new file mode 100644 index 0000000..3196f75 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/RetireSoldierController.java @@ -0,0 +1,72 @@ +package net.lab1024.sa.admin.module.business.village.controller; + +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.RetireSoldierVO; +import net.lab1024.sa.admin.module.business.village.service.RetireSoldierService; +import net.lab1024.sa.base.common.domain.ValidateList; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import cn.dev33.satoken.annotation.SaCheckPermission; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 退役军人信息 Controller + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@RestController +@Tag(name = "退役军人信息") +public class RetireSoldierController { + + @Resource + private RetireSoldierService retireSoldierService; + + @Operation(summary = "分页查询 @author pengjie") + @PostMapping("/retireSoldier/queryPage") + @SaCheckPermission("retireSoldier:query") + public ResponseDTO> queryPage(@RequestBody @Valid RetireSoldierQueryForm queryForm) { + return ResponseDTO.ok(retireSoldierService.queryPage(queryForm)); + } + + @Operation(summary = "添加 @author pengjie") + @PostMapping("/retireSoldier/add") + @SaCheckPermission("retireSoldier:add") + public ResponseDTO add(@RequestBody @Valid RetireSoldierAddForm addForm) { + return retireSoldierService.add(addForm); + } + + @Operation(summary = "更新 @author pengjie") + @PostMapping("/retireSoldier/update") + @SaCheckPermission("retireSoldier:update") + public ResponseDTO update(@RequestBody @Valid RetireSoldierUpdateForm updateForm) { + return retireSoldierService.update(updateForm); + } + + @Operation(summary = "批量删除 @author pengjie") + @PostMapping("/retireSoldier/batchDelete") + @SaCheckPermission("retireSoldier:delete") + public ResponseDTO batchDelete(@RequestBody ValidateList idList) { + return retireSoldierService.batchDelete(idList); + } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/retireSoldier/delete/{soldierId}") + @SaCheckPermission("retireSoldier:delete") + public ResponseDTO batchDelete(@PathVariable Long soldierId) { + return retireSoldierService.delete(soldierId); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/SoldierChildrenController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/SoldierChildrenController.java new file mode 100644 index 0000000..28abe38 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/SoldierChildrenController.java @@ -0,0 +1,72 @@ +package net.lab1024.sa.admin.module.business.village.controller; + +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.SoldierChildrenVO; +import net.lab1024.sa.admin.module.business.village.service.SoldierChildrenService; +import net.lab1024.sa.base.common.domain.ValidateList; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import cn.dev33.satoken.annotation.SaCheckPermission; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 烈士子女信息 Controller + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@RestController +@Tag(name = "烈士子女信息") +public class SoldierChildrenController { + + @Resource + private SoldierChildrenService soldierChildrenService; + + @Operation(summary = "分页查询 @author pengjie") + @PostMapping("/soldierChildren/queryPage") + @SaCheckPermission("soldierChildren:query") + public ResponseDTO> queryPage(@RequestBody @Valid SoldierChildrenQueryForm queryForm) { + return ResponseDTO.ok(soldierChildrenService.queryPage(queryForm)); + } + + @Operation(summary = "添加 @author pengjie") + @PostMapping("/soldierChildren/add") + @SaCheckPermission("soldierChildren:add") + public ResponseDTO add(@RequestBody @Valid SoldierChildrenAddForm addForm) { + return soldierChildrenService.add(addForm); + } + + @Operation(summary = "更新 @author pengjie") + @PostMapping("/soldierChildren/update") + @SaCheckPermission("soldierChildren:update") + public ResponseDTO update(@RequestBody @Valid SoldierChildrenUpdateForm updateForm) { + return soldierChildrenService.update(updateForm); + } + + @Operation(summary = "批量删除 @author pengjie") + @PostMapping("/soldierChildren/batchDelete") + @SaCheckPermission("soldierChildren:delete") + public ResponseDTO batchDelete(@RequestBody ValidateList idList) { + return soldierChildrenService.batchDelete(idList); + } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/soldierChildren/delete/{childrenId}") + @SaCheckPermission("soldierChildren:delete") + public ResponseDTO batchDelete(@PathVariable Long childrenId) { + return soldierChildrenService.delete(childrenId); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/ComfortSoldierDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/ComfortSoldierDao.java new file mode 100644 index 0000000..3bc292a --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/ComfortSoldierDao.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.dao; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.domain.entity.ComfortSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.ComfortSoldierVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.annotation.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 优抚军人信息 Dao + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Mapper +@Component +@DataScope +public interface ComfortSoldierDao extends BaseMapper { + + /** + * 分页 查询 + * + * @param page + * @param queryForm + * @return + */ + List queryPage(Page page, @Param("queryForm") ComfortSoldierQueryForm queryForm); + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/DisabilitySoldierDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/DisabilitySoldierDao.java new file mode 100644 index 0000000..5c68837 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/DisabilitySoldierDao.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.dao; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.domain.entity.DisabilitySoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.DisabilitySoldierVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.annotation.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 伤残军人信息 Dao + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Mapper +@Component +@DataScope +public interface DisabilitySoldierDao extends BaseMapper { + + /** + * 分页 查询 + * + * @param page + * @param queryForm + * @return + */ + List queryPage(Page page, @Param("queryForm") DisabilitySoldierQueryForm queryForm); + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/PromotionSoldierDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/PromotionSoldierDao.java new file mode 100644 index 0000000..59478cc --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/PromotionSoldierDao.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.dao; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.domain.entity.PromotionSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.PromotionSoldierVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.annotation.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 提干军人信息 Dao + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Mapper +@Component +@DataScope +public interface PromotionSoldierDao extends BaseMapper { + + /** + * 分页 查询 + * + * @param page + * @param queryForm + * @return + */ + List queryPage(Page page, @Param("queryForm") PromotionSoldierQueryForm queryForm); + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/RetireSoldierDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/RetireSoldierDao.java new file mode 100644 index 0000000..33e0f3d --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/RetireSoldierDao.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.dao; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.domain.entity.RetireSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.RetireSoldierVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.annotation.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 退役军人信息 Dao + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Mapper +@Component +@DataScope +public interface RetireSoldierDao extends BaseMapper { + + /** + * 分页 查询 + * + * @param page + * @param queryForm + * @return + */ + List queryPage(Page page, @Param("queryForm") RetireSoldierQueryForm queryForm); + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/SoldierChildrenDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/SoldierChildrenDao.java new file mode 100644 index 0000000..0eb3514 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/SoldierChildrenDao.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.dao; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.domain.entity.SoldierChildrenEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.SoldierChildrenVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.annotation.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 烈士子女信息 Dao + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Mapper +@Component +@DataScope +public interface SoldierChildrenDao extends BaseMapper { + + /** + * 分页 查询 + * + * @param page + * @param queryForm + * @return + */ + List queryPage(Page page, @Param("queryForm") SoldierChildrenQueryForm queryForm); + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/ComfortSoldierEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/ComfortSoldierEntity.java new file mode 100644 index 0000000..742587d --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/ComfortSoldierEntity.java @@ -0,0 +1,74 @@ +package net.lab1024.sa.admin.module.business.village.domain.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 优抚军人信息 实体类 + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Data +@TableName("comfort_soldier") +public class ComfortSoldierEntity { + + /** + * 优抚军人ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long soldierId; + + /** + * 人员ID + */ + private Long villagerId; + + /** + * 入伍日期 + */ + private LocalDate enlistmentTime; + + /** + * 退伍日期 + */ + private LocalDate dischargeTime; + + /** + * 对象属别 + */ + private String type; + + /** + * 评定时间 + */ + private LocalDate judgeTime; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 乡村ID + */ + private Integer villageId; + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/DisabilitySoldierEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/DisabilitySoldierEntity.java new file mode 100644 index 0000000..e53d2ab --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/DisabilitySoldierEntity.java @@ -0,0 +1,89 @@ +package net.lab1024.sa.admin.module.business.village.domain.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 伤残军人信息 实体类 + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Data +@TableName("disability_soldier") +public class DisabilitySoldierEntity { + + /** + * 伤残军人ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long soldierId; + + /** + * 人员ID + */ + private Long villagerId; + + /** + * 伤残程度 + */ + private String degree; + + /** + * 伤残原因 + */ + private String reason; + + /** + * 抚恤金 + */ + private String deathBenefit; + + /** + * 受何惩罚 + */ + private String punishment; + + /** + * 入伍日期 + */ + private LocalDate enlistmentTime; + + /** + * 服役年限 + */ + private String serviceYear; + + /** + * 退伍日期 + */ + private LocalDate dischargeTime; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 乡村ID + */ + private Integer villageId; + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/PromotionSoldierEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/PromotionSoldierEntity.java new file mode 100644 index 0000000..026314f --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/PromotionSoldierEntity.java @@ -0,0 +1,73 @@ +package net.lab1024.sa.admin.module.business.village.domain.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 提干军人信息 实体类 + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Data +@TableName("promotion_soldier") +public class PromotionSoldierEntity { + + /** + * 提干军人ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long soldierId; + + /** + * 人员ID + */ + private Long villagerId; + + /** + * 原部队名称 + */ + private String originalUnit; + + /** + * 原部队职务 + */ + private String originalPosition; + + /** + * 现工作单位 + */ + private String currentUnit; + + /** + * 现工作职务 + */ + private String currentPosition; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 乡村ID + */ + private Integer villageId; + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/RetireSoldierEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/RetireSoldierEntity.java new file mode 100644 index 0000000..91beaf5 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/RetireSoldierEntity.java @@ -0,0 +1,79 @@ +package net.lab1024.sa.admin.module.business.village.domain.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 退役军人信息 实体类 + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Data +@TableName("retire_soldier") +public class RetireSoldierEntity { + + /** + * 退役军人ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long soldierId; + + /** + * 人员ID + */ + private Long villagerId; + + /** + * 入伍日期 + */ + private LocalDate enlistmentTime; + + /** + * 何地入伍 + */ + private String enlistmentAddress; + + /** + * 军种 + */ + private String soldierType; + + /** + * 部队职务 + */ + private String militaryPosition; + + /** + * 退伍日期 + */ + private LocalDate dischargeTime; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 乡村ID + */ + private Integer villageId; + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/SoldierChildrenEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/SoldierChildrenEntity.java new file mode 100644 index 0000000..672b91b --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/entity/SoldierChildrenEntity.java @@ -0,0 +1,74 @@ +package net.lab1024.sa.admin.module.business.village.domain.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 烈士子女信息 实体类 + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Data +@TableName("soldier_children") +public class SoldierChildrenEntity { + + /** + * 军人子女ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long childrenId; + + /** + * 人员ID + */ + private Long villagerId; + + /** + * 牺牲者姓名 + */ + private String soldierName; + + /** + * 牺牲者身份 + */ + private String soldierIdentity; + + /** + * 牺牲时间 + */ + private LocalDate sacrificingTime; + + /** + * 困难类别 + */ + private String difficultyCategory; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 乡村ID + */ + private Integer villageId; + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierAddForm.java new file mode 100644 index 0000000..2e97dd1 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierAddForm.java @@ -0,0 +1,33 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import lombok.Data; + +/** + * 优抚军人信息 新建表单 + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Data +public class ComfortSoldierAddForm { + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + + @Schema(description = "对象属别") + private String type; + + @Schema(description = "评定时间") + private LocalDate judgeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierQueryForm.java new file mode 100644 index 0000000..59db06a --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierQueryForm.java @@ -0,0 +1,39 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import net.lab1024.sa.base.common.domain.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +/** + * 优抚军人信息 分页查询表单 + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class ComfortSoldierQueryForm extends PageParam { + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "性别") + private String sex; + + @Schema(description = "民族") + private String nation; + + @Schema(description = "出生日期") + private LocalDate birthdayBegin; + + @Schema(description = "出生日期") + private LocalDate birthdayEnd; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierUpdateForm.java new file mode 100644 index 0000000..e233374 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/ComfortSoldierUpdateForm.java @@ -0,0 +1,38 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * 优抚军人信息 更新表单 + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Data +public class ComfortSoldierUpdateForm { + + @Schema(description = "优抚军人ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "优抚军人ID 不能为空") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + + @Schema(description = "对象属别") + private String type; + + @Schema(description = "评定时间") + private LocalDate judgeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierAddForm.java new file mode 100644 index 0000000..e212b0e --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierAddForm.java @@ -0,0 +1,42 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import lombok.Data; + +/** + * 伤残军人信息 新建表单 + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Data +public class DisabilitySoldierAddForm { + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "伤残程度") + private String degree; + + @Schema(description = "伤残原因") + private String reason; + + @Schema(description = "抚恤金") + private String deathBenefit; + + @Schema(description = "受何惩罚") + private String punishment; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "服役年限") + private String serviceYear; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierQueryForm.java new file mode 100644 index 0000000..f9aacb2 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierQueryForm.java @@ -0,0 +1,39 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import net.lab1024.sa.base.common.domain.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +/** + * 伤残军人信息 分页查询表单 + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class DisabilitySoldierQueryForm extends PageParam { + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "性别") + private String sex; + + @Schema(description = "民族") + private String nation; + + @Schema(description = "出生日期") + private LocalDate birthdayBegin; + + @Schema(description = "出生日期") + private LocalDate birthdayEnd; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierUpdateForm.java new file mode 100644 index 0000000..1b9a34b --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/DisabilitySoldierUpdateForm.java @@ -0,0 +1,47 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * 伤残军人信息 更新表单 + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Data +public class DisabilitySoldierUpdateForm { + + @Schema(description = "伤残军人ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "伤残军人ID 不能为空") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "伤残程度") + private String degree; + + @Schema(description = "伤残原因") + private String reason; + + @Schema(description = "抚恤金") + private String deathBenefit; + + @Schema(description = "受何惩罚") + private String punishment; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "服役年限") + private String serviceYear; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierAddForm.java new file mode 100644 index 0000000..5391b3f --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierAddForm.java @@ -0,0 +1,32 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 提干军人信息 新建表单 + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Data +public class PromotionSoldierAddForm { + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "原部队名称") + private String originalUnit; + + @Schema(description = "原部队职务") + private String originalPosition; + + @Schema(description = "现工作单位") + private String currentUnit; + + @Schema(description = "现工作职务") + private String currentPosition; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierQueryForm.java new file mode 100644 index 0000000..7bb2528 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierQueryForm.java @@ -0,0 +1,39 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import net.lab1024.sa.base.common.domain.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +/** + * 提干军人信息 分页查询表单 + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class PromotionSoldierQueryForm extends PageParam { + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "性别") + private String sex; + + @Schema(description = "民族") + private String nation; + + @Schema(description = "出生日期") + private LocalDate birthdayBegin; + + @Schema(description = "出生日期") + private LocalDate birthdayEnd; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierUpdateForm.java new file mode 100644 index 0000000..0d04082 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/PromotionSoldierUpdateForm.java @@ -0,0 +1,37 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * 提干军人信息 更新表单 + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Data +public class PromotionSoldierUpdateForm { + + @Schema(description = "提干军人ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "提干军人ID 不能为空") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "原部队名称") + private String originalUnit; + + @Schema(description = "原部队职务") + private String originalPosition; + + @Schema(description = "现工作单位") + private String currentUnit; + + @Schema(description = "现工作职务") + private String currentPosition; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierAddForm.java new file mode 100644 index 0000000..97d8500 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierAddForm.java @@ -0,0 +1,36 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import lombok.Data; + +/** + * 退役军人信息 新建表单 + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Data +public class RetireSoldierAddForm { + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "何地入伍") + private String enlistmentAddress; + + @Schema(description = "军种") + private String soldierType; + + @Schema(description = "部队职务") + private String militaryPosition; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierQueryForm.java new file mode 100644 index 0000000..6822123 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierQueryForm.java @@ -0,0 +1,39 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import net.lab1024.sa.base.common.domain.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +/** + * 退役军人信息 分页查询表单 + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class RetireSoldierQueryForm extends PageParam { + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "性别") + private String sex; + + @Schema(description = "民族") + private String nation; + + @Schema(description = "出生日期") + private LocalDate birthdayBegin; + + @Schema(description = "出生日期") + private LocalDate birthdayEnd; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierUpdateForm.java new file mode 100644 index 0000000..21c7181 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/RetireSoldierUpdateForm.java @@ -0,0 +1,41 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * 退役军人信息 更新表单 + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Data +public class RetireSoldierUpdateForm { + + @Schema(description = "退役军人ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "退役军人ID 不能为空") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "何地入伍") + private String enlistmentAddress; + + @Schema(description = "军种") + private String soldierType; + + @Schema(description = "部队职务") + private String militaryPosition; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenAddForm.java new file mode 100644 index 0000000..9d94686 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenAddForm.java @@ -0,0 +1,33 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import lombok.Data; + +/** + * 烈士子女信息 新建表单 + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Data +public class SoldierChildrenAddForm { + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "牺牲者姓名") + private String soldierName; + + @Schema(description = "牺牲者身份") + private String soldierIdentity; + + @Schema(description = "牺牲时间") + private LocalDate sacrificingTime; + + @Schema(description = "困难类别") + private String difficultyCategory; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenQueryForm.java new file mode 100644 index 0000000..4f15350 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenQueryForm.java @@ -0,0 +1,39 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import net.lab1024.sa.base.common.domain.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +/** + * 烈士子女信息 分页查询表单 + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Data +@EqualsAndHashCode(callSuper = false) +public class SoldierChildrenQueryForm extends PageParam { + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "性别") + private String sex; + + @Schema(description = "民族") + private String nation; + + @Schema(description = "出生日期") + private LocalDate birthdayBegin; + + @Schema(description = "出生日期") + private LocalDate birthdayEnd; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenUpdateForm.java new file mode 100644 index 0000000..992a93e --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/SoldierChildrenUpdateForm.java @@ -0,0 +1,38 @@ +package net.lab1024.sa.admin.module.business.village.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * 烈士子女信息 更新表单 + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Data +public class SoldierChildrenUpdateForm { + + @Schema(description = "军人子女ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "军人子女ID 不能为空") + private Long childrenId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "牺牲者姓名") + private String soldierName; + + @Schema(description = "牺牲者身份") + private String soldierIdentity; + + @Schema(description = "牺牲时间") + private LocalDate sacrificingTime; + + @Schema(description = "困难类别") + private String difficultyCategory; + +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/ComfortSoldierVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/ComfortSoldierVO.java new file mode 100644 index 0000000..50e7c16 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/ComfortSoldierVO.java @@ -0,0 +1,83 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; +import net.lab1024.sa.base.module.support.datamasking.DataMasking; +import net.lab1024.sa.base.module.support.datamasking.DataMaskingTypeEnum; + +/** + * 优抚军人信息 列表VO + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Data +public class ComfortSoldierVO { + + + @Schema(description = "优抚军人ID") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + + @Schema(description = "对象属别") + private String type; + + @Schema(description = "评定时间") + private LocalDate judgeTime; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "乡村ID") + private Integer villageId; + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "网格名称") + private String gridName; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "小组名称") + private String groupName; + + @Schema(description = "姓名") + private String name; + + @DataMasking(DataMaskingTypeEnum.ID_CARD) + @Schema(description = "证件号码") + private String cardNumber; + + @Schema(description = "性别") + private Integer sex; + + @Schema(description = "名族") + private String nation; + + @DataMasking(DataMaskingTypeEnum.PHONE) + @Schema(description = "联系方式") + private String phone; + + @Schema(description = "出生日期") + private String birthday; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/DisabilitySoldierVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/DisabilitySoldierVO.java new file mode 100644 index 0000000..e3a78af --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/DisabilitySoldierVO.java @@ -0,0 +1,92 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; +import net.lab1024.sa.base.module.support.datamasking.DataMasking; +import net.lab1024.sa.base.module.support.datamasking.DataMaskingTypeEnum; + +/** + * 伤残军人信息 列表VO + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Data +public class DisabilitySoldierVO { + + + @Schema(description = "伤残军人ID") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "伤残程度") + private String degree; + + @Schema(description = "伤残原因") + private String reason; + + @Schema(description = "抚恤金") + private String deathBenefit; + + @Schema(description = "受何惩罚") + private String punishment; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "服役年限") + private String serviceYear; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "乡村ID") + private Integer villageId; + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "网格名称") + private String gridName; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "小组名称") + private String groupName; + + @Schema(description = "姓名") + private String name; + + @DataMasking(DataMaskingTypeEnum.ID_CARD) + @Schema(description = "证件号码") + private String cardNumber; + + @Schema(description = "性别") + private Integer sex; + + @Schema(description = "名族") + private String nation; + + @DataMasking(DataMaskingTypeEnum.PHONE) + @Schema(description = "联系方式") + private String phone; + + @Schema(description = "出生日期") + private String birthday; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/PromotionSoldierVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/PromotionSoldierVO.java new file mode 100644 index 0000000..97a8ca2 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/PromotionSoldierVO.java @@ -0,0 +1,82 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.Data; +import net.lab1024.sa.base.module.support.datamasking.DataMasking; +import net.lab1024.sa.base.module.support.datamasking.DataMaskingTypeEnum; + +/** + * 提干军人信息 列表VO + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Data +public class PromotionSoldierVO { + + + @Schema(description = "提干军人ID") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "原部队名称") + private String originalUnit; + + @Schema(description = "原部队职务") + private String originalPosition; + + @Schema(description = "现工作单位") + private String currentUnit; + + @Schema(description = "现工作职务") + private String currentPosition; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "乡村ID") + private Integer villageId; + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "网格名称") + private String gridName; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "小组名称") + private String groupName; + + @Schema(description = "姓名") + private String name; + + @DataMasking(DataMaskingTypeEnum.ID_CARD) + @Schema(description = "证件号码") + private String cardNumber; + + @Schema(description = "性别") + private Integer sex; + + @Schema(description = "名族") + private String nation; + + @DataMasking(DataMaskingTypeEnum.PHONE) + @Schema(description = "联系方式") + private String phone; + + @Schema(description = "出生日期") + private String birthday; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/RetireSoldierVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/RetireSoldierVO.java new file mode 100644 index 0000000..6529d8d --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/RetireSoldierVO.java @@ -0,0 +1,86 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; +import net.lab1024.sa.base.module.support.datamasking.DataMasking; +import net.lab1024.sa.base.module.support.datamasking.DataMaskingTypeEnum; + +/** + * 退役军人信息 列表VO + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Data +public class RetireSoldierVO { + + + @Schema(description = "退役军人ID") + private Long soldierId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "入伍日期") + private LocalDate enlistmentTime; + + @Schema(description = "何地入伍") + private String enlistmentAddress; + + @Schema(description = "军种") + private String soldierType; + + @Schema(description = "部队职务") + private String militaryPosition; + + @Schema(description = "退伍日期") + private LocalDate dischargeTime; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "乡村ID") + private Integer villageId; + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "网格名称") + private String gridName; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "小组名称") + private String groupName; + + @Schema(description = "姓名") + private String name; + + @DataMasking(DataMaskingTypeEnum.ID_CARD) + @Schema(description = "证件号码") + private String cardNumber; + + @Schema(description = "性别") + private Integer sex; + + @Schema(description = "名族") + private String nation; + + @DataMasking(DataMaskingTypeEnum.PHONE) + @Schema(description = "联系方式") + private String phone; + + @Schema(description = "出生日期") + private String birthday; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/SoldierChildrenVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/SoldierChildrenVO.java new file mode 100644 index 0000000..7da7939 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/SoldierChildrenVO.java @@ -0,0 +1,83 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; +import net.lab1024.sa.base.module.support.datamasking.DataMasking; +import net.lab1024.sa.base.module.support.datamasking.DataMaskingTypeEnum; + +/** + * 烈士子女信息 列表VO + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Data +public class SoldierChildrenVO { + + + @Schema(description = "军人子女ID") + private Long childrenId; + + @Schema(description = "人员ID") + private Long villagerId; + + @Schema(description = "牺牲者姓名") + private String soldierName; + + @Schema(description = "牺牲者身份") + private String soldierIdentity; + + @Schema(description = "牺牲时间") + private LocalDate sacrificingTime; + + @Schema(description = "困难类别") + private String difficultyCategory; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "乡村ID") + private Integer villageId; + + @Schema(description = "网格ID") + private Long gridId; + + @Schema(description = "网格名称") + private String gridName; + + @Schema(description = "小组ID") + private Long groupId; + + @Schema(description = "小组名称") + private String groupName; + + @Schema(description = "姓名") + private String name; + + @DataMasking(DataMaskingTypeEnum.ID_CARD) + @Schema(description = "证件号码") + private String cardNumber; + + @Schema(description = "性别") + private Integer sex; + + @Schema(description = "名族") + private String nation; + + @DataMasking(DataMaskingTypeEnum.PHONE) + @Schema(description = "联系方式") + private String phone; + + @Schema(description = "出生日期") + private String birthday; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/ComfortSoldierManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/ComfortSoldierManager.java new file mode 100644 index 0000000..ad43cc6 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/ComfortSoldierManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.village.manager; + +import net.lab1024.sa.admin.module.business.village.domain.entity.ComfortSoldierEntity; +import net.lab1024.sa.admin.module.business.village.dao.ComfortSoldierDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 优抚军人信息 Manager + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ +@Service +public class ComfortSoldierManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/DisabilitySoldierManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/DisabilitySoldierManager.java new file mode 100644 index 0000000..6aa5428 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/DisabilitySoldierManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.village.manager; + +import net.lab1024.sa.admin.module.business.village.dao.DisabilitySoldierDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.DisabilitySoldierEntity; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 伤残军人信息 Manager + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ +@Service +public class DisabilitySoldierManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/PromotionSoldierManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/PromotionSoldierManager.java new file mode 100644 index 0000000..880d0ca --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/PromotionSoldierManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.village.manager; + +import net.lab1024.sa.admin.module.business.village.domain.entity.PromotionSoldierEntity; +import net.lab1024.sa.admin.module.business.village.dao.PromotionSoldierDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 提干军人信息 Manager + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ +@Service +public class PromotionSoldierManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/RetireSoldierManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/RetireSoldierManager.java new file mode 100644 index 0000000..badc368 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/RetireSoldierManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.village.manager; + +import net.lab1024.sa.admin.module.business.village.domain.entity.RetireSoldierEntity; +import net.lab1024.sa.admin.module.business.village.dao.RetireSoldierDao; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 退役军人信息 Manager + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ +@Service +public class RetireSoldierManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/SoldierChildrenManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/SoldierChildrenManager.java new file mode 100644 index 0000000..20175d2 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/manager/SoldierChildrenManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.village.manager; + +import net.lab1024.sa.admin.module.business.village.dao.SoldierChildrenDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.SoldierChildrenEntity; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 烈士子女信息 Manager + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ +@Service +public class SoldierChildrenManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/ComfortSoldierService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/ComfortSoldierService.java new file mode 100644 index 0000000..69cf01e --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/ComfortSoldierService.java @@ -0,0 +1,94 @@ +package net.lab1024.sa.admin.module.business.village.service; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.dao.ComfortSoldierDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.ComfortSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.ComfortSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.ComfortSoldierVO; +import net.lab1024.sa.base.common.util.SmartBeanUtil; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 优抚军人信息 Service + * + * @Author pengjie + * @Date 2025-06-30 15:52:45 + * @Copyright jxj + */ + +@Service +public class ComfortSoldierService { + + @Resource + private ComfortSoldierDao comfortSoldierDao; + + /** + * 分页查询 + * + * @param queryForm + * @return + */ + public PageResult queryPage(ComfortSoldierQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = comfortSoldierDao.queryPage(page, queryForm); + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); + return pageResult; + } + + /** + * 添加 + */ + public ResponseDTO add(ComfortSoldierAddForm addForm) { + ComfortSoldierEntity comfortSoldierEntity = SmartBeanUtil.copy(addForm, ComfortSoldierEntity.class); + comfortSoldierDao.insert(comfortSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 更新 + * + * @param updateForm + * @return + */ + public ResponseDTO update(ComfortSoldierUpdateForm updateForm) { + ComfortSoldierEntity comfortSoldierEntity = SmartBeanUtil.copy(updateForm, ComfortSoldierEntity.class); + comfortSoldierDao.updateById(comfortSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 批量删除 + * + * @param idList + * @return + */ + public ResponseDTO batchDelete(List idList) { + if (CollectionUtils.isEmpty(idList)){ + return ResponseDTO.ok(); + } + + comfortSoldierDao.deleteBatchIds(idList); + return ResponseDTO.ok(); + } + + /** + * 单个删除 + */ + public ResponseDTO delete(Long soldierId) { + if (null == soldierId){ + return ResponseDTO.ok(); + } + + comfortSoldierDao.deleteById(soldierId); + return ResponseDTO.ok(); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/DisabilitySoldierService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/DisabilitySoldierService.java new file mode 100644 index 0000000..2f22f70 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/DisabilitySoldierService.java @@ -0,0 +1,94 @@ +package net.lab1024.sa.admin.module.business.village.service; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.dao.DisabilitySoldierDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.DisabilitySoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.DisabilitySoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.DisabilitySoldierVO; +import net.lab1024.sa.base.common.util.SmartBeanUtil; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 伤残军人信息 Service + * + * @Author pengjie + * @Date 2025-06-30 15:39:31 + * @Copyright jxj + */ + +@Service +public class DisabilitySoldierService { + + @Resource + private DisabilitySoldierDao disabilitySoldierDao; + + /** + * 分页查询 + * + * @param queryForm + * @return + */ + public PageResult queryPage(DisabilitySoldierQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = disabilitySoldierDao.queryPage(page, queryForm); + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); + return pageResult; + } + + /** + * 添加 + */ + public ResponseDTO add(DisabilitySoldierAddForm addForm) { + DisabilitySoldierEntity disabilitySoldierEntity = SmartBeanUtil.copy(addForm, DisabilitySoldierEntity.class); + disabilitySoldierDao.insert(disabilitySoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 更新 + * + * @param updateForm + * @return + */ + public ResponseDTO update(DisabilitySoldierUpdateForm updateForm) { + DisabilitySoldierEntity disabilitySoldierEntity = SmartBeanUtil.copy(updateForm, DisabilitySoldierEntity.class); + disabilitySoldierDao.updateById(disabilitySoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 批量删除 + * + * @param idList + * @return + */ + public ResponseDTO batchDelete(List idList) { + if (CollectionUtils.isEmpty(idList)){ + return ResponseDTO.ok(); + } + + disabilitySoldierDao.deleteBatchIds(idList); + return ResponseDTO.ok(); + } + + /** + * 单个删除 + */ + public ResponseDTO delete(Long soldierId) { + if (null == soldierId){ + return ResponseDTO.ok(); + } + + disabilitySoldierDao.deleteById(soldierId); + return ResponseDTO.ok(); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/PromotionSoldierService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/PromotionSoldierService.java new file mode 100644 index 0000000..5108396 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/PromotionSoldierService.java @@ -0,0 +1,94 @@ +package net.lab1024.sa.admin.module.business.village.service; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.dao.PromotionSoldierDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.PromotionSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.PromotionSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.PromotionSoldierVO; +import net.lab1024.sa.base.common.util.SmartBeanUtil; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 提干军人信息 Service + * + * @Author pengjie + * @Date 2025-06-30 15:46:27 + * @Copyright jxj + */ + +@Service +public class PromotionSoldierService { + + @Resource + private PromotionSoldierDao promotionSoldierDao; + + /** + * 分页查询 + * + * @param queryForm + * @return + */ + public PageResult queryPage(PromotionSoldierQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = promotionSoldierDao.queryPage(page, queryForm); + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); + return pageResult; + } + + /** + * 添加 + */ + public ResponseDTO add(PromotionSoldierAddForm addForm) { + PromotionSoldierEntity promotionSoldierEntity = SmartBeanUtil.copy(addForm, PromotionSoldierEntity.class); + promotionSoldierDao.insert(promotionSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 更新 + * + * @param updateForm + * @return + */ + public ResponseDTO update(PromotionSoldierUpdateForm updateForm) { + PromotionSoldierEntity promotionSoldierEntity = SmartBeanUtil.copy(updateForm, PromotionSoldierEntity.class); + promotionSoldierDao.updateById(promotionSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 批量删除 + * + * @param idList + * @return + */ + public ResponseDTO batchDelete(List idList) { + if (CollectionUtils.isEmpty(idList)){ + return ResponseDTO.ok(); + } + + promotionSoldierDao.deleteBatchIds(idList); + return ResponseDTO.ok(); + } + + /** + * 单个删除 + */ + public ResponseDTO delete(Long soldierId) { + if (null == soldierId){ + return ResponseDTO.ok(); + } + + promotionSoldierDao.deleteById(soldierId); + return ResponseDTO.ok(); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/RetireSoldierService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/RetireSoldierService.java new file mode 100644 index 0000000..1c57011 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/RetireSoldierService.java @@ -0,0 +1,94 @@ +package net.lab1024.sa.admin.module.business.village.service; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.dao.RetireSoldierDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.RetireSoldierEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.RetireSoldierUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.RetireSoldierVO; +import net.lab1024.sa.base.common.util.SmartBeanUtil; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 退役军人信息 Service + * + * @Author pengjie + * @Date 2025-06-30 15:43:23 + * @Copyright jxj + */ + +@Service +public class RetireSoldierService { + + @Resource + private RetireSoldierDao retireSoldierDao; + + /** + * 分页查询 + * + * @param queryForm + * @return + */ + public PageResult queryPage(RetireSoldierQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = retireSoldierDao.queryPage(page, queryForm); + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); + return pageResult; + } + + /** + * 添加 + */ + public ResponseDTO add(RetireSoldierAddForm addForm) { + RetireSoldierEntity retireSoldierEntity = SmartBeanUtil.copy(addForm, RetireSoldierEntity.class); + retireSoldierDao.insert(retireSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 更新 + * + * @param updateForm + * @return + */ + public ResponseDTO update(RetireSoldierUpdateForm updateForm) { + RetireSoldierEntity retireSoldierEntity = SmartBeanUtil.copy(updateForm, RetireSoldierEntity.class); + retireSoldierDao.updateById(retireSoldierEntity); + return ResponseDTO.ok(); + } + + /** + * 批量删除 + * + * @param idList + * @return + */ + public ResponseDTO batchDelete(List idList) { + if (CollectionUtils.isEmpty(idList)){ + return ResponseDTO.ok(); + } + + retireSoldierDao.deleteBatchIds(idList); + return ResponseDTO.ok(); + } + + /** + * 单个删除 + */ + public ResponseDTO delete(Long soldierId) { + if (null == soldierId){ + return ResponseDTO.ok(); + } + + retireSoldierDao.deleteById(soldierId); + return ResponseDTO.ok(); + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/SoldierChildrenService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/SoldierChildrenService.java new file mode 100644 index 0000000..ce2335c --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/SoldierChildrenService.java @@ -0,0 +1,94 @@ +package net.lab1024.sa.admin.module.business.village.service; + +import java.util.List; +import net.lab1024.sa.admin.module.business.village.dao.SoldierChildrenDao; +import net.lab1024.sa.admin.module.business.village.domain.entity.SoldierChildrenEntity; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenAddForm; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.form.SoldierChildrenUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.SoldierChildrenVO; +import net.lab1024.sa.base.common.util.SmartBeanUtil; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 烈士子女信息 Service + * + * @Author pengjie + * @Date 2025-06-30 15:50:02 + * @Copyright jxj + */ + +@Service +public class SoldierChildrenService { + + @Resource + private SoldierChildrenDao soldierChildrenDao; + + /** + * 分页查询 + * + * @param queryForm + * @return + */ + public PageResult queryPage(SoldierChildrenQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = soldierChildrenDao.queryPage(page, queryForm); + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); + return pageResult; + } + + /** + * 添加 + */ + public ResponseDTO add(SoldierChildrenAddForm addForm) { + SoldierChildrenEntity soldierChildrenEntity = SmartBeanUtil.copy(addForm, SoldierChildrenEntity.class); + soldierChildrenDao.insert(soldierChildrenEntity); + return ResponseDTO.ok(); + } + + /** + * 更新 + * + * @param updateForm + * @return + */ + public ResponseDTO update(SoldierChildrenUpdateForm updateForm) { + SoldierChildrenEntity soldierChildrenEntity = SmartBeanUtil.copy(updateForm, SoldierChildrenEntity.class); + soldierChildrenDao.updateById(soldierChildrenEntity); + return ResponseDTO.ok(); + } + + /** + * 批量删除 + * + * @param idList + * @return + */ + public ResponseDTO batchDelete(List idList) { + if (CollectionUtils.isEmpty(idList)){ + return ResponseDTO.ok(); + } + + soldierChildrenDao.deleteBatchIds(idList); + return ResponseDTO.ok(); + } + + /** + * 单个删除 + */ + public ResponseDTO delete(Long childrenId) { + if (null == childrenId){ + return ResponseDTO.ok(); + } + + soldierChildrenDao.deleteById(childrenId); + return ResponseDTO.ok(); + } +} diff --git a/sa-admin/src/main/resources/mapper/business/village/ComfortSoldierMapper.xml b/sa-admin/src/main/resources/mapper/business/village/ComfortSoldierMapper.xml new file mode 100644 index 0000000..c183130 --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/village/ComfortSoldierMapper.xml @@ -0,0 +1,65 @@ + + + + + + + comfort_soldier.soldier_id, + comfort_soldier.villager_id, + comfort_soldier.enlistment_time, + comfort_soldier.discharge_time, + comfort_soldier.type, + comfort_soldier.judge_time, + comfort_soldier.create_time, + comfort_soldier.create_by, + comfort_soldier.update_time, + comfort_soldier.village_id, + villager.grid_id, + villager.group_id, + villager.name, + villager.card_number, + villager.sex, + villager.nation, + villager.phone, + villager.birthday, + grid.name gridName, + group_info.name groupName + + + + + + + diff --git a/sa-admin/src/main/resources/mapper/business/village/DisabilitySoldierMapper.xml b/sa-admin/src/main/resources/mapper/business/village/DisabilitySoldierMapper.xml new file mode 100644 index 0000000..8e040f7 --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/village/DisabilitySoldierMapper.xml @@ -0,0 +1,68 @@ + + + + + + + disability_soldier.soldier_id, + disability_soldier.villager_id, + disability_soldier.degree, + disability_soldier.reason, + disability_soldier.death_benefit, + disability_soldier.punishment, + disability_soldier.enlistment_time, + disability_soldier.service_year, + disability_soldier.discharge_time, + disability_soldier.create_time, + disability_soldier.create_by, + disability_soldier.update_time, + disability_soldier.village_id, + villager.grid_id, + villager.group_id, + villager.name, + villager.card_number, + villager.sex, + villager.nation, + villager.phone, + villager.birthday, + grid.name gridName, + group_info.name groupName + + + + + + + diff --git a/sa-admin/src/main/resources/mapper/business/village/PromotionSoldierMapper.xml b/sa-admin/src/main/resources/mapper/business/village/PromotionSoldierMapper.xml new file mode 100644 index 0000000..4776018 --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/village/PromotionSoldierMapper.xml @@ -0,0 +1,65 @@ + + + + + + + promotion_soldier.soldier_id, + promotion_soldier.villager_id, + promotion_soldier.original_unit, + promotion_soldier.original_position, + promotion_soldier.current_unit, + promotion_soldier.current_position, + promotion_soldier.create_time, + promotion_soldier.create_by, + promotion_soldier.update_time, + promotion_soldier.village_id, + villager.grid_id, + villager.group_id, + villager.name, + villager.card_number, + villager.sex, + villager.nation, + villager.phone, + villager.birthday, + grid.name gridName, + group_info.name groupName + + + + + + + diff --git a/sa-admin/src/main/resources/mapper/business/village/RetireSoldierMapper.xml b/sa-admin/src/main/resources/mapper/business/village/RetireSoldierMapper.xml new file mode 100644 index 0000000..e7d26f0 --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/village/RetireSoldierMapper.xml @@ -0,0 +1,66 @@ + + + + + + + retire_soldier.soldier_id, + retire_soldier.villager_id, + retire_soldier.enlistment_time, + retire_soldier.enlistment_address, + retire_soldier.soldier_type, + retire_soldier.military_position, + retire_soldier.discharge_time, + retire_soldier.create_time, + retire_soldier.create_by, + retire_soldier.update_time, + retire_soldier.village_id, + villager.grid_id, + villager.group_id, + villager.name, + villager.card_number, + villager.sex, + villager.nation, + villager.phone, + villager.birthday, + grid.name gridName, + group_info.name groupName + + + + + + + diff --git a/sa-admin/src/main/resources/mapper/business/village/SoldierChildrenMapper.xml b/sa-admin/src/main/resources/mapper/business/village/SoldierChildrenMapper.xml new file mode 100644 index 0000000..6dbc58d --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/village/SoldierChildrenMapper.xml @@ -0,0 +1,65 @@ + + + + + + + soldier_children.children_id, + soldier_children.villager_id, + soldier_children.soldier_name, + soldier_children.soldier_identity, + soldier_children.sacrificing_time, + soldier_children.difficulty_category, + soldier_children.create_time, + soldier_children.create_by, + soldier_children.update_time, + soldier_children.village_id, + villager.grid_id, + villager.group_id, + villager.name, + villager.card_number, + villager.sex, + villager.nation, + villager.phone, + villager.birthday, + grid.name gridName, + group_info.name groupName + + + + + + +