diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/controller/PayCaseCommitteeController.java similarity index 90% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/controller/PayCaseCommitteeController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/controller/PayCaseCommitteeController.java index 5ff87a62..9c099f24 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/controller/PayCaseCommitteeController.java @@ -1,11 +1,8 @@ -package com.jero.payCaseCommittee.controller; +package com.jero.dataMangement.payCaseCommittee.controller; -import java.text.SimpleDateFormat; -import java.time.LocalTime; import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,16 +13,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO; -import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO; -import com.jero.payCaseCommittee.entity.PayCaseCommittee; -import com.jero.payCaseCommittee.service.IPayCaseCommitteeService; -import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; -import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; +import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO; +import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO; +import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee; +import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; import lombok.extern.slf4j.Slf4j; -import net.sf.saxon.functions.DynamicContextAccessor; -import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java similarity index 93% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java index 42b5d04c..b7f8275f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java @@ -1,4 +1,4 @@ -package com.jero.payCaseCommittee.entity.DTO; +package com.jero.dataMangement.payCaseCommittee.entity.DTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/PayCaseCommittee.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/PayCaseCommittee.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/PayCaseCommittee.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/PayCaseCommittee.java index e49645e4..70862426 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/PayCaseCommittee.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/PayCaseCommittee.java @@ -1,4 +1,4 @@ -package com.jero.payCaseCommittee.entity; +package com.jero.dataMangement.payCaseCommittee.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/PayCaseCommitteeMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/PayCaseCommitteeMapper.java similarity index 66% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/PayCaseCommitteeMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/PayCaseCommitteeMapper.java index a57e2d21..86d05da7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/PayCaseCommitteeMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/PayCaseCommitteeMapper.java @@ -1,8 +1,8 @@ -package com.jero.payCaseCommittee.mapper; +package com.jero.dataMangement.payCaseCommittee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.payCaseCommittee.entity.PayCaseCommittee; +import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee; /** * @Description: pay_case_committee diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/IPayCaseCommitteeService.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/IPayCaseCommitteeService.java similarity index 66% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/IPayCaseCommitteeService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/IPayCaseCommitteeService.java index 618ac928..1c2ea248 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/IPayCaseCommitteeService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/IPayCaseCommitteeService.java @@ -1,6 +1,6 @@ -package com.jero.payCaseCommittee.service; +package com.jero.dataMangement.payCaseCommittee.service; -import com.jero.payCaseCommittee.entity.PayCaseCommittee; +import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java similarity index 56% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java index 45b1ee91..6e01b31e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java @@ -1,10 +1,10 @@ -package com.jero.payCaseCommittee.service.impl; +package com.jero.dataMangement.payCaseCommittee.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.payCaseCommittee.entity.PayCaseCommittee; -import com.jero.payCaseCommittee.mapper.PayCaseCommitteeMapper; -import com.jero.payCaseCommittee.service.IPayCaseCommitteeService; +import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee; +import com.jero.dataMangement.payCaseCommittee.mapper.PayCaseCommitteeMapper; +import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService; import org.springframework.stereotype.Service; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java similarity index 93% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java index c4fa6d49..60c3bb83 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java @@ -1,8 +1,6 @@ -package com.jero.payCaseCommitteeSubitem.controller; - +package com.jero.dataMangement.payCaseCommitteeSubitem.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,14 +8,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO; -import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; -import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java similarity index 82% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java index 53523acc..eb5ec76d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java @@ -1,11 +1,8 @@ -package com.jero.payCaseCommitteeSubitem.entity.DTO; +package com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; import javax.validation.constraints.NotBlank; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java index 2a2cfebd..3fa69f79 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java @@ -1,4 +1,4 @@ -package com.jero.payCaseCommitteeSubitem.entity; +package com.jero.dataMangement.payCaseCommitteeSubitem.entity; import java.io.Serializable; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java similarity index 64% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java index 4de718a1..1e723c10 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java @@ -1,7 +1,7 @@ -package com.jero.payCaseCommitteeSubitem.mapper; +package com.jero.dataMangement.payCaseCommitteeSubitem.mapper; -import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java similarity index 57% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java index c2c7d72d..712b7d98 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java @@ -1,9 +1,8 @@ -package com.jero.payCaseCommitteeSubitem.service; +package com.jero.dataMangement.payCaseCommitteeSubitem.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO; -import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; /** * @Description: pay_case_committee_subitem diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java similarity index 53% rename from jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 73cee275..5eddd2a6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -1,11 +1,10 @@ -package com.jero.payCaseCommitteeSubitem.service.impl; +package com.jero.dataMangement.payCaseCommitteeSubitem.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO; -import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; -import com.jero.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper; -import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; +import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem; +import com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper; +import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService; import org.springframework.stereotype.Service;