空项目

common/src/main/java/com/jpsoft/supervision/modules/base/dao/AdjustDetailDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface AdjustDetailDAO {
-	int insert(AdjustDetail entity);
-	int update(AdjustDetail entity);
-	int exist(String id);
-	AdjustDetail get(String id);
-	int delete(String id);
-	List<AdjustDetail> list();
-	List<AdjustDetail> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<AdjustDetailDAO> pageSearchDTO(Map<String, Object> searchParams, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApplicationMiddleDAO.java

@@ -1,25 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface ApplicationMiddleDAO {
-	int insert(ApplicationMiddle entity);
-	int update(ApplicationMiddle entity);
-	int exist(String id);
-	ApplicationMiddle get(String id);
-	int delete(String id);
-	List<ApplicationMiddle> list();
-	List<ApplicationMiddle> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<ApplicationMiddleDTO> searchDTO(Map<String, Object> searchParams, List<Sort> sortList);
-	List<ApplicationMiddle> findByPersonId(String personId);
-	long existByIdCard(String idCard, String applicationId);
-
-    List<ApplicationMiddle> findByStudentId(String id);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApplicationPrimaryDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface ApplicationPrimaryDAO {
-	int insert(ApplicationPrimary entity);
-	int update(ApplicationPrimary entity);
-	int exist(String id);
-	ApplicationPrimary get(String id);
-	int delete(String id);
-	List<ApplicationPrimary> list();
-	List<ApplicationPrimary> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<ApplicationPrimaryDTO> searchDTO(Map<String, Object> searchParams, List<Sort> sortList);
-    List<ApplicationPrimary> findByPersonId(String personId);
-    long existByIdCard(String idCard, String applicationId);
-
-	List<ApplicationPrimary> findByStudentId(String id);
-	ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApportionDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.Apportion;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface ApportionDAO {
-	int insert(Apportion entity);
-	int update(Apportion entity);
-	int exist(String id);
-	Apportion get(String id);
-	int delete(String id);
-	List<Apportion> list();
-	List<Apportion> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApportionDetailDAO.java

@@ -1,22 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface ApportionDetailDAO {
-	int insert(ApportionDetail entity);
-	int update(ApportionDetail entity);
-	int exist(String id);
-	ApportionDetail get(String id);
-	int delete(String id);
-	List<ApportionDetail> findByStudentId(String studentId);
-	List<ApportionDetail> list();
-	List<ApportionDetail> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<ApportionDetailDTO> pageSearchDTO(Map<String, Object> searchParams, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApprovalInfoDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface ApprovalInfoDAO {
-	int insert(ApprovalInfo entity);
-	int update(ApprovalInfo entity);
-	int exist(String id);
-	ApprovalInfo get(String id);
-	int delete(String id);
-	List<ApprovalInfo> list();
-	List<ApprovalInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<ApprovalInfo> findByApplicationId(String applicationId);
-	List<ApprovalInfo> findByApplicationIdAndOperation(String applicationId,String operation);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/DistrictInfoDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface DistrictInfoDAO {
-	int insert(DistrictInfo entity);
-	int update(DistrictInfo entity);
-	int exist(String id);
-	DistrictInfo get(String id);
-	int delete(String id);
-	List<DistrictInfo> list();
-	List<DistrictInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-    List<DistrictInfo> findByStreetId(String streetId);
-    List<DistrictInfo> findActiveByStreetId(String enrollmentType,String type, String streetId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/EnrollControlDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import com.jpsoft.supervision.modules.base.entity.EnrollControl;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-17 13:18
- */
-@Repository
-public interface EnrollControlDAO {
-
-    int insert(EnrollControl entity);
-    int update(EnrollControl entity);
-    int exist(String id);
-    EnrollControl get(String id);
-    int delete(String id);
-    List<EnrollControl> list();
-    List<EnrollControl> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-    List<EnrollControl> findBySchoolTypeAndStudentType(String schoolType, String studentType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/NewsInfoDAO.java

@@ -1,22 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.NewsInfo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface NewsInfoDAO {
-	int insert(NewsInfo entity);
-	int update(NewsInfo entity);
-	int exist(String id);
-	NewsInfo get(String id);
-	int delete(String id);
-	List<NewsInfo> list();
-	List<NewsInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-    List<NewsInfo> findByTypeAndStatus(@Param("type") String type, @Param("status") String status);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/OfferInfoDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.OfferInfo;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface OfferInfoDAO {
-	int insert(OfferInfo entity);
-	int update(OfferInfo entity);
-	int exist(String id);
-	OfferInfo get(String id);
-	int delete(String id);
-	int findMaxSerialNum(String schoolId,String enrollmentType);
-	List<OfferInfo> list();
-	List<OfferInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/PersonInfoDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.PersonInfo;
-import org.springframework.stereotype.Repository;
-
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface PersonInfoDAO {
-	int insert(PersonInfo entity);
-	int update(PersonInfo entity);
-	int exist(String id);
-	PersonInfo get(String id);
-	int delete(String id);
-	List<PersonInfo> list();
-	List<PersonInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-    PersonInfo findByPhone(String phone);
-
-    PersonInfo findByOpenId(String openId);
-
-    PersonInfo findByIdCard(String idCard);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/PersonStudentDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.PersonStudent;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface PersonStudentDAO {
-	int insert(PersonStudent entity);
-	int update(PersonStudent entity);
-	int exist(String id);
-	PersonStudent get(String id);
-	int delete(String id);
-	List<PersonStudent> list();
-	List<PersonStudent> search(Map<String, Object> searchParams, List<Sort> sortList);
-    PersonStudent findByPersonIdAndStudentId(String personId, String studentId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/SchoolInfoDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface SchoolInfoDAO {
-	int insert(SchoolInfo entity);
-	int update(SchoolInfo entity);
-	int exist(String id);
-	SchoolInfo get(String id);
-	int delete(String id);
-	List<SchoolInfo> list();
-	List<SchoolInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-    List<SchoolInfo> findByEnrollmentType(String enrollmentType);
-	long countByParentId(@Param("parentId") String parentId);
-	List<SchoolInfo> findByParentId(@Param("parentId") String parentId);
-	int updateParentIdNull(SchoolInfo model) ;
-
-    List<SchoolInfo> findActiveSchoolByEnrollmentType(String type, String enrollmentType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/SchoolRelationDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-2 14:32
- */
-@Repository
-public interface SchoolRelationDAO {
-
-    int insert(SchoolRelation entity);
-    int update(SchoolRelation entity);
-    int exist(String id);
-    SchoolRelation get(String id);
-    int delete(String id);
-    List<SchoolRelation> list();
-    List<SchoolRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-    List<SchoolRelation> findByPrimaryId(String primaryId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/StudentFilesDAO.java

@@ -1,31 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.StudentFiles;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface StudentFilesDAO {
-	int insert(StudentFiles entity);
-
-	int update(StudentFiles entity);
-
-	int exist(String id);
-
-	StudentFiles get(String id);
-
-	int delete(String id);
-
-	List<StudentFiles> list();
-
-	List<StudentFiles> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-	List<StudentFiles> findByApplicationIdAndFileType(String applicationId, String fileType);
-
-	int deleteByApplicationIdAndFileType(String applicationId, String fileType);
-
-	List<String> findUrlByApplicationIdAndFileType(String applicationId, String fileType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/StudentInfoDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.entity.StudentInfo;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface StudentInfoDAO {
-	int insert(StudentInfo entity);
-	int update(StudentInfo entity);
-	int exist(String id);
-	StudentInfo get(String id);
-	int delete(String id);
-	List<StudentInfo> list();
-	List<StudentInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-    StudentInfo findByIdCard(String idCard);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/AdjustDetailDTO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class AdjustDetailDTO implements Serializable {
-    @ApiModelProperty(value = "编号")
-    private String id;
-    @ApiModelProperty(value = "学生姓名")
-    private String studentName;
-    @ApiModelProperty(value = "学生证件类型")
-    private String studentCardType;
-    @ApiModelProperty(value = "学生证件号码")
-    private String studentIdCard;
-    @ApiModelProperty(value = "报名类型")
-    private String typeName;
-    @ApiModelProperty(value = "报名学校")
-    private String schoolName;
-    @ApiModelProperty(value = "报名状态")
-    private String statusName;
-    @ApiModelProperty(value = "预录取学校")
-    private String offerName;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApplicationMiddleDTO.java

@@ -1,167 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ApplicationMiddleDTO implements Serializable {
-    @ApiModelProperty(value = "申请表单编号")
-    private String applicationId;
-
-    @NotBlank(message = "报名类型不能为空")
-    @ApiModelProperty(value = "报名类型(A,B,C,D,E)")
-    private String type;
-
-    @ApiModelProperty(value = "学生编号")
-    private String studentId;
-
-    @NotBlank(message = "姓名不能为空")
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "曾用名")
-    private String oldName;
-
-    @ApiModelProperty(value = "性别:1男2女")
-    private Integer sex;
-
-    @NotBlank(message = "证件类型不能为空")
-    @ApiModelProperty(value = "证件类型")
-    private String cardType;
-
-    @NotBlank(message = "身份证不能为空")
-    @ApiModelProperty(value = "身份证")
-    private String idCard;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "民族")
-    private String nation;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "出生年月")
-    private Date birthday;
-
-    @ApiModelProperty(value = "证件上传地址")
-    private String documentUrl;
-
-    @ApiModelProperty(value = "所属街道")
-    private String streetId;
-
-    @ApiModelProperty(value = "所在社区")
-    private String communityId;
-
-    @NotBlank(message = "选择学校不能为空")
-    @ApiModelProperty(value = "选择学校")
-    private String schoolId;
-
-    @ApiModelProperty(value = "择校原因")
-    private String chooseReason;
-
-    @ApiModelProperty(value = "关系")
-    private String relationship;
-
-    @ApiModelProperty(value = "报名资料数据目录")
-    private String categoryId;
-
-    @ApiModelProperty(value = "报名相关资料")
-    private List<AttachmentDTO> registrationFileList;
-
-    @ApiModelProperty(value = "学生证明附件")
-    private List<AttachmentDTO> studentCertificationFileList;
-
-    @ApiModelProperty(value = "关系名称")
-    private String relationshipName;
-
-    @ApiModelProperty(value = "报名类型名称")
-    private String typeName;
-
-    @ApiModelProperty(value = "审批状态名称")
-    private String statusName;
-
-    @ApiModelProperty(value = "审批状态")
-    private String status;
-
-    @ApiModelProperty(value = "学校名称")
-    private String schoolName;
-
-    @ApiModelProperty(value = "学生类型（1：小学，2：中学，3：高中）")
-    private String studentType;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-
-    @ApiModelProperty(value = "登记人ID")
-    private String personId;
-
-    @ApiModelProperty(value = "发送微信消息")
-    private Boolean isSend;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "微信消息发送时间")
-    private Date sendTime;
-
-    @ApiModelProperty(value = "报名资料数据目录")
-    private String categoryName;
-
-    @ApiModelProperty(value = "录取编号")
-    private String offerId;
-
-    @ApiModelProperty(value = "录取学校名称")
-    private String offerName;
-
-    @ApiModelProperty(value = "派位信息")
-    private ApportionDetail apportionDetail;
-
-    /**
-     *录取编号
-     */
-    @ApiModelProperty(value = "录取编号")
-    private String offerCode;
-
-    @ApiModelProperty(value = "入学通知书")
-    private String offerImg;
-
-    @ApiModelProperty(value = "登记人名称")
-    private String personName;
-    @ApiModelProperty(value = "登记人电话")
-    private String personPhone;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApplicationPrimaryDTO.java

@@ -1,164 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ApplicationPrimaryDTO implements Serializable {
-    @ApiModelProperty(value = "申请表单编号")
-    private String applicationId;
-
-    @NotBlank(message = "报名类型不能为空")
-    @ApiModelProperty(value = "报名类型(A,B,C)")
-    private String type;
-
-    @ApiModelProperty(value = "学生编号")
-    private String studentId;
-
-    @NotBlank(message = "姓名不能为空")
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "曾用名")
-    private String oldName;
-
-    @ApiModelProperty(value = "性别:1男2女")
-    private Integer sex;
-
-    @NotBlank(message = "证件类型不能为空")
-    @ApiModelProperty(value = "证件类型")
-    private String cardType;
-
-    @ApiModelProperty(value = "身份证")
-    private String idCard;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "民族")
-    private String nation;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "出生年月")
-    private Date birthday;
-
-    @ApiModelProperty(value = "证件上传地址")
-    private String documentUrl;
-
-    @ApiModelProperty(value = "所属街道")
-    private String streetId;
-
-    @ApiModelProperty(value = "所在社区")
-    private String communityId;
-
-    @ApiModelProperty(value = "选择学校")
-    private String schoolId;
-
-    @ApiModelProperty(value = "关系")
-    private String relationship;
-
-    @ApiModelProperty(value = "报名资料数据目录")
-    private String categoryId;
-
-    @ApiModelProperty(value = "报名相关资料")
-    private List<AttachmentDTO> registrationFileList;
-
-    @ApiModelProperty(value = "学生证明附件")
-    private List<AttachmentDTO> studentCertificationFileList;
-
-    @ApiModelProperty(value = "关系名称")
-    private String relationshipName;
-
-    @ApiModelProperty(value = "报名类型名称")
-    private String typeName;
-
-    @ApiModelProperty(value = "审批状态名称")
-    private String statusName;
-
-    @ApiModelProperty(value = "审批状态")
-    private String status;
-
-    @ApiModelProperty(value = "学校名称")
-    private String schoolName;
-
-    @ApiModelProperty(value = "学生类型（1：小学，2：中学，3：高中）")
-    private String studentType;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-
-    @ApiModelProperty(value = "择校原因")
-    private String chooseReason;
-
-    @ApiModelProperty(value = "登记人ID")
-    private String personId;
-
-    @ApiModelProperty(value = "发送微信消息")
-    private Boolean isSend;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "微信消息发送时间")
-    private Date sendTime;
-
-    @ApiModelProperty(value = "派位信息")
-    private ApportionDetail apportionDetail;
-
-    @ApiModelProperty(value = "报名资料数据目录")
-    private String categoryName;
-
-    @ApiModelProperty(value = "录取编号")
-    private String offerId;
-
-    @ApiModelProperty(value = "录取学校名称")
-    private String offerName;
-
-    /**
-     *录取编号
-     */
-    @ApiModelProperty(value = "录取编号")
-    private String offerCode;
-    @ApiModelProperty(value = "入学通知书")
-    private String offerImg;
-
-    @ApiModelProperty(value = "登记人名称")
-    private String personName;
-    @ApiModelProperty(value = "登记人电话")
-    private String personPhone;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApportionDetailDTO.java

@@ -1,28 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class ApportionDetailDTO implements Serializable {
-    @ApiModelProperty(value = "编号")
-    private String id;
-    @ApiModelProperty(value = "学生姓名")
-    private String studentName;
-    @ApiModelProperty(value = "学生证件类型")
-    private String studentCardType;
-    @ApiModelProperty(value = "学生证件号码")
-    private String studentIdCard;
-    @ApiModelProperty(value = "报名类型")
-    private String typeName;
-    @ApiModelProperty(value = "报名学校")
-    private String schoolName;
-    @ApiModelProperty(value = "报名状态")
-    private String statusName;
-    @ApiModelProperty(value = "预录取学校")
-    private String offerName;
-    @ApiModelProperty(value = "派位结果")
-    private String winner;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/AttachmentDTO.java

@@ -1,15 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class AttachmentDTO implements Serializable {
-    private String id;
-    private String name;
-    private String type;
-    private String remark;
-    private List<String> files;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/NewsDTO.java

@@ -1,29 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-6-23 15:03
- */
-@Data
-public class NewsDTO {
-
-    private String id;
-
-    private String type;
-
-    private String subtitle;
-
-    private String name;
-
-    private String logo;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
-    private Date createTime;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/SchoolInfoDTO.java

@@ -1,30 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import lombok.Data;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-6-23 9:36
- */
-@Data
-public class SchoolInfoDTO {
-
-    private String id;
-
-    private String name;
-
-    private String logo;
-
-    private String address;
-
-    private String phone;
-
-    private String introduction;
-
-    private String longitude;
-
-    private String latitude;
-
-    private String remark;
-
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/AdjustDetail.java

@@ -1,71 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_adjust_detail的实体类
- */
-@Data
-@ApiModel(value = "base_adjust_detail的实体类")
-public class AdjustDetail {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *申请ID
-	 */
-        @ApiModelProperty(value = "申请ID")
-	private String applicationId;
-	/**
-	 *学生ID
-	 */
-        @ApiModelProperty(value = "学生ID")
-	private String studentId;
-	/**
-	 *注册用户(家长)ID
-	 */
-        @ApiModelProperty(value = "注册用户(家长)ID")
-	private String personId;
-	/**
-	 *调剂学校ID
-	 */
-        @ApiModelProperty(value = "调剂学校ID")
-	private String schoolId;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApplicationMiddle.java

@@ -1,129 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_application_middle的实体类
- */
-@Data
-@ApiModel(value = "base_application_middle的实体类")
-public class ApplicationMiddle {
-
-
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String id;
-	/**
-	 * 创建人
-	 */
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 * 创建时间
-	 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 * 更新人
-	 */
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 * 更新时间
-	 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 * 删除标示
-	 */
-	@ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 * 报名类型(A,B,C)
-	 */
-	@ApiModelProperty(value = "报名类型(A,B,C)")
-	private String type;
-	/**
-	 * 摇奖必中
-	 */
-	@ApiModelProperty(value = "摇奖必中")
-	private String hit = "0";
-	/**
-	 * 审核状态
-	 */
-	@ApiModelProperty(value = "审核状态")
-	private String status;
-	/**
-	 * 报名类型对应数据目录
-	 */
-	@ApiModelProperty(value = "报名类型对应数据目录")
-	private String categoryId;
-	/**
-	 * 现居住地
-	 */
-	@ApiModelProperty(value = "现居住地")
-	private String nowAddress;
-	/**
-	 * 申请用户ID
-	 */
-	@ApiModelProperty(value = "申请用户ID")
-	private String personId;
-	/**
-	 * 申请学生ID
-	 */
-	@ApiModelProperty(value = "申请学生ID")
-	private String studentId;
-	/**
-	 * 序号
-	 */
-	@ApiModelProperty(value = "序号")
-	private Integer sortNo;
-
-	@ApiModelProperty(value = "学校编号")
-	private String schoolId;
-
-	@ApiModelProperty(value = "所属街道")
-	private String streetId;
-
-	@ApiModelProperty(value = "所在社区")
-	private String communityId;
-
-	@ApiModelProperty(value = "择校原因")
-	private String chooseReason;
-
-	@ApiModelProperty(value = "录取编号")
-	private String offerId;
-	@ApiModelProperty(value = "录取学校名称")
-	private String offerName;
-	/**
-	 *录取编号
-	 */
-	@ApiModelProperty(value = "录取编号")
-	private String offerCode;
-
-	@ApiModelProperty(value = "发送微信消息")
-	private Boolean isSend;
-
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	@ApiModelProperty(value = "微信消息发送时间")
-	private Date sendTime;
-
-	@ApiModelProperty(value = "入学通知书")
-	private String offerImg;
-
-	@ApiModelProperty(value = "新类型")
-	private String newType;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApplicationPrimary.java

@@ -1,125 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_application_primary的实体类
- */
-@Data
-@ApiModel(value = "base_application_primary的实体类")
-public class ApplicationPrimary {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 报名类型(A,B,C)
-     */
-    @ApiModelProperty(value = "报名类型(A,B,C)")
-    private String type;
-    /**
-     * 报名类型(A,B,C)
-     */
-    @ApiModelProperty(value = "摇奖必中")
-    private String hit;
-    /**
-     * 审核状态
-     */
-    @ApiModelProperty(value = "审核状态")
-    private String status;
-    /**
-     * 报名类型对应数据目录
-     */
-    @ApiModelProperty(value = "报名类型对应数据目录")
-    private String categoryId;
-    /**
-     * 现居住地
-     */
-    @ApiModelProperty(value = "现居住地")
-    private String nowAddress;
-    /**
-     * 申请用户ID
-     */
-    @ApiModelProperty(value = "申请用户ID")
-    private String personId;
-    /**
-     * 申请学生ID
-     */
-    @ApiModelProperty(value = "申请学生ID")
-    private String studentId;
-    /**
-     * 序号
-     */
-    @ApiModelProperty(value = "序号")
-    private Integer sortNo;
-
-    @ApiModelProperty(value = "学校编号")
-    private String schoolId;
-
-    @ApiModelProperty(value = "所属街道")
-    private String streetId;
-
-    @ApiModelProperty(value = "所在社区")
-    private String communityId;
-
-    @ApiModelProperty(value = "录取编号")
-    private String offerId;
-
-    @ApiModelProperty(value = "录取学校名称")
-    private String offerName;
-    /**
-     *录取编号
-     */
-    @ApiModelProperty(value = "录取编号")
-    private String offerCode;
-
-    @ApiModelProperty(value = "发送微信消息")
-    private Boolean isSend;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "微信消息发送时间")
-    private Date sendTime;
-
-    @ApiModelProperty(value = "入学通知书")
-    private String offerImg;
-
-    @ApiModelProperty(value = "新类型")
-    private String newType;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/Apportion.java

@@ -1,64 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_apportion的实体类
- */
-@Data
-@ApiModel(value = "base_apportion的实体类")
-public class Apportion {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *学校ID
-	 */
-        @ApiModelProperty(value = "学校ID")
-	private String schoolId;
-	private String schoolName;
-	/**
-	 *报名类型(A,B,C)
-	 */
-        @ApiModelProperty(value = "报名类型(A,B,C)")
-	private String type;
-	private String typeName;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	private String createByName;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApportionDetail.java

@@ -1,89 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_apportion_detail的实体类
- */
-@Data
-@ApiModel(value = "base_apportion_detail的实体类")
-public class ApportionDetail {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *派位ID
-	 */
-        @ApiModelProperty(value = "派位ID")
-	private String apportionId;
-	/**
-	 *申请ID
-	 */
-        @ApiModelProperty(value = "申请ID")
-	private String applicationId;
-	/**
-	 *学生ID
-	 */
-        @ApiModelProperty(value = "学生ID")
-	private String studentId;
-	/**
-	 *注册用户(家长)ID
-	 */
-        @ApiModelProperty(value = "注册用户(家长)ID")
-	private String personId;
-	/**
-	 *录取学校ID
-	 */
-        @ApiModelProperty(value = "录取学校ID")
-	private String schoolId;
-	/**
-	 *派位结果
-	 */
-	@ApiModelProperty(value = "派位结果")
-    private Boolean winner;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-
-	@ApiModelProperty(value = "录取学校名称")
-	private String schoolName;
-	@ApiModelProperty(value = "学生名称")
-	private String studentName;
-	@ApiModelProperty(value = "学生证件号")
-	private String studentCard;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApprovalInfo.java

@@ -1,75 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_approval_info的实体类
- */
-@Data
-@ApiModel(value = "base_approval_info的实体类")
-public class ApprovalInfo {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 申请ID
-     */
-    @ApiModelProperty(value = "申请ID")
-    private String applicationId;
-    /**
-     * 执行操作
-     */
-    @ApiModelProperty(value = "执行操作")
-    private String operation;
-    /**
-     * 备注信息
-     */
-    @ApiModelProperty(value = "备注信息")
-    private String remark;
-    /**
-     * 审核文件
-     */
-    @ApiModelProperty(value = "审核文件")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "审核文件列表")
-    private List<String> fileUrlList;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/DistrictInfo.java

@@ -1,88 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_district_info的实体类
- */
-@Data
-@ApiModel(value = "base_district_info的实体类")
-public class DistrictInfo {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 街道农场ID(字典
-     */
-    @ApiModelProperty(value = "街道农场ID(字典")
-    private String streetId;
-    /**
-     * 街道农场ID(字典
-     */
-    @ApiModelProperty(value = "街道农场ID(字典")
-    private String streetName;
-    /**
-     * 社区分场名称
-     */
-    @ApiModelProperty(value = "社区分场名称")
-    private String name;
-    /**
-     * 学校ID
-     */
-    @ApiModelProperty(value = "学校ID")
-    private String schoolId;
-
-    /**
-     * 学校名称
-     */
-    @ApiModelProperty(value = "学校名称")
-    private String schoolName;
-
-    /**
-     * 经度
-     */
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-    /**
-     * 维度
-     */
-    @ApiModelProperty(value = "维度")
-    private String latitude;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/EnrollControl.java

@@ -1,60 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-17 13:13
- */
-@Data
-public class EnrollControl {
-
-    private String id;
-
-    private String schoolId;
-
-    private String schoolType;
-
-    private String studentType;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
-    private Date startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
-    private Date endTime;
-
-    /**
-     *创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     *创建时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     *更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     *更新时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     *删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/NewsInfo.java

@@ -1,94 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_news_info的实体类
- */
-@Data
-@ApiModel(value = "base_news_info的实体类")
-public class NewsInfo {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *类型:1轮播图新闻,2文字新闻
-	 */
-        @ApiModelProperty(value = "类型:1轮播图新闻,2文字新闻")
-	private String type;
-	/**
-	 *标题
-	 */
-        @ApiModelProperty(value = "标题")
-	private String title;
-	/**
-	 *副标题
-	 */
-	@ApiModelProperty(value = "副标题")
-	private String subtitle;
-	/**
-	 *封面图
-	 */
-        @ApiModelProperty(value = "封面图")
-	private String logo;
-	/**
-	 *备注
-	 */
-        @ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-	 *链接
-	 */
-        @ApiModelProperty(value = "链接")
-	private String link;
-	/**
-	 *内容
-	 */
-        @ApiModelProperty(value = "内容")
-	private String content;
-	/**
-	 *审核状态:0:未审核,1已审核,2关闭
-	 */
-        @ApiModelProperty(value = "审核状态:0:未审核,1已审核,2关闭")
-	private String status;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "排序号")
-	private Integer sortNo;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/OfferInfo.java

@@ -1,88 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_offer_info的实体类
- */
-@Data
-@ApiModel(value = "base_offer_info的实体类")
-public class OfferInfo {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *学生ID
-	 */
-        @ApiModelProperty(value = "学生ID")
-	private String studentId;
-	/**
-	 *申请单ID
-	 */
-        @ApiModelProperty(value = "申请单ID")
-	private String applicationId;
-	/**
-	 *招生类型:(1小学一年级/2小升初
-	 */
-        @ApiModelProperty(value = "招生类型:(1小学一年级/2小升初")
-	private String enrollmentType;
-	/**
-	 *录取学校ID
-	 */
-        @ApiModelProperty(value = "录取学校ID")
-	private String schoolId;
-	/**
-	 *序号
-	 */
-        @ApiModelProperty(value = "序号")
-	private Integer serialNum;
-	/**
-	 *录取编号
-	 */
-        @ApiModelProperty(value = "录取编号")
-	private String code;
-	/**
-	 *报道时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "报道时间")
-	private Date reportTime;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/PersonInfo.java

@@ -1,81 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_person_info的实体类
- */
-@Data
-@ApiModel(value = "base_person_info的实体类")
-public class PersonInfo {
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "主键")
-	private String id;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 *姓名
-	 */
-        @ApiModelProperty(value = "姓名")
-	private String name;
-	/**
-	 *身份证
-	 */
-        @ApiModelProperty(value = "身份证")
-	private String idCard;
-	/**
-	 *手机号
-	 */
-        @ApiModelProperty(value = "手机号")
-	private String phone;
-	/**
-	 *微信openId
-	 */
-        @ApiModelProperty(value = "微信openId")
-	private String openId;
-	/**
-	 *正式居住房类型
-	 */
-        @ApiModelProperty(value = "正式居住房类型")
-	private String houseType;
-	/**
-	 *现居住地
-	 */
-        @ApiModelProperty(value = "现居住地")
-	private String nowAddress;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/PersonStudent.java

@@ -1,66 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_person_student的实体类
- */
-@Data
-@ApiModel(value = "base_person_student的实体类")
-public class PersonStudent {
-	/**
-	 *
-	 */
-        @ApiModelProperty(value = "")
-	private String id;
-	/**
-	 *创建人
-	 */
-        @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-	 *创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-	 *更新人
-	 */
-        @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**
-	 *更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**
-	 *删除标示
-	 */
-        @ApiModelProperty(value = "删除标示")
-	private Boolean delFlag;
-	/**
-	 *注册用户(家长)ID
-	 */
-        @ApiModelProperty(value = "注册用户(家长)ID")
-	private String personId;
-	/**
-	 *学生ID
-	 */
-        @ApiModelProperty(value = "学生ID")
-	private String studentId;
-	/**
-	 *关系
-	 */
-        @ApiModelProperty(value = "关系")
-	private String relationship;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/SchoolInfo.java

@@ -1,131 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_school_info的实体类
- */
-@Data
-@ApiModel(value = "base_school_info的实体类")
-public class SchoolInfo {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 学校名称
-     */
-    @ApiModelProperty(value = "学校名称")
-    private String name;
-    /**
-     * 校园logo图片地址
-     */
-    @ApiModelProperty(value = "校园logo图片地址")
-    private String logo;
-    /**
-     * 招生类型:(1小学一年级/2小升初
-     */
-    @ApiModelProperty(value = "招生类型:(1小学一年级/2小升初")
-    private String enrollmentType;
-    /**
-     * 招生类型翻译
-     */
-    private String enrollmentTypeName;
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value = "地址")
-    private String address;
-    /**
-     * 招生电话
-     */
-    @ApiModelProperty(value = "招生电话")
-    private String phone;
-    /**
-     * 讲师介绍
-     */
-    @ApiModelProperty(value = "讲师介绍")
-    private String lectorIntroduction;
-    /**
-     * 经度
-     */
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-    /**
-     * 维度
-     */
-    @ApiModelProperty(value = "维度")
-    private String latitude;
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "上级code")
-    private String code;
-
-    /**
-     * 学校介绍
-     */
-    @ApiModelProperty(value = "学校介绍")
-    private String introduction;
-
-    /**
-     * 学区
-     */
-    @ApiModelProperty(value = "学区")
-    private String parentId;
-    /**
-     * 学区
-     */
-    @ApiModelProperty(value = "学区名称")
-    private String parentName;
-
-
-    /**
-     * 学校编码"
-     */
-    @ApiModelProperty(value = "学校编码")
-    private String schoolCode;
-
-    @ApiModelProperty(value = "是否有子单位")
-    private Boolean hasChildren;
-
-    @ApiModelProperty(value = "类型/1学校/2校区")
-    private String type;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/SchoolRelation.java

@@ -1,74 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-2 14:27
- */
-@Data
-@ApiModel(value = "base_school_relation的实体类")
-public class SchoolRelation {
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-
-
-    /**
-     * 小学id
-     */
-    @ApiModelProperty(value = "小学id")
-    private String primaryId;
-
-    /**
-     * 中学id
-     */
-    @ApiModelProperty(value = "中学id")
-    private String middleId;
-
-    /**
-     * 备注
-     *
-     */
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/StudentFiles.java

@@ -1,74 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_student_files的实体类
- */
-@Data
-@ApiModel(value = "base_student_files的实体类")
-public class StudentFiles {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 学生ID
-     */
-    @ApiModelProperty(value = "学生ID")
-    private String studentId;
-    /**
-     * 附件类型
-     */
-    @ApiModelProperty(value = "附件类型")
-    private String fileType;
-    /**
-     * 附件地址
-     */
-    @ApiModelProperty(value = "附件地址")
-    private String fileUrl;
-    /**
-     * 申请表ID
-     */
-    @ApiModelProperty(value = "申请表ID")
-    private String applicationId;
-
-    @ApiModelProperty(value = "序号")
-    private Integer sortNo;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/StudentInfo.java

@@ -1,120 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 描述:base_student_info的实体类
- */
-@Data
-@ApiModel(value = "base_student_info的实体类")
-public class StudentInfo {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 删除标示
-     */
-    @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    private String name;
-    /**
-     * 曾用名
-     */
-    @ApiModelProperty(value = "曾用名")
-    private String oldName;
-    /**
-     * 性别:1男2女
-     */
-    @ApiModelProperty(value = "性别:1男2女")
-    private Integer sex;
-    /**
-     * 证件类型
-     */
-    @ApiModelProperty(value = "证件类型")
-    private String cardType;
-    /**
-     * 身份证
-     */
-    @ApiModelProperty(value = "身份证")
-    private String idCard;
-
-    @ApiModelProperty(value = "证件上传地址")
-    private String documentUrl;
-
-    /**
-     * 出生年月
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "出生年月")
-    private Date birthday;
-    /**
-     * 登记人姓名
-     */
-    @ApiModelProperty(value = "登记人姓名")
-    private String registerName;
-    /**
-     * 登记人手机号
-     */
-    @ApiModelProperty(value = "登记人手机号")
-    private String registerTel;
-    /**
-     * 审批状态
-     */
-    @ApiModelProperty(value = "审批状态")
-    private String status;
-    /**
-     * 民族
-     */
-    @ApiModelProperty(value = "民族")
-    private String nation;
-    /**
-     * 是否政策生
-     */
-    @ApiModelProperty(value = "是否政策生")
-    private Boolean isPolicy;
-    /**
-     * 类型:小学,中学,大学等
-     */
-    @ApiModelProperty(value = "类型:小学,中学,大学等")
-    private String type;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/AdjustDetailService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface AdjustDetailService {
-	AdjustDetail get(String id);
-	boolean exist(String id);
-	int insert(AdjustDetail model);
-	int update(AdjustDetail model);
-	int delete(String id);
-	List<AdjustDetail> list();
-	Page<AdjustDetail> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<AdjustDetailDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/ApplicationMiddleService.java

@@ -1,23 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface ApplicationMiddleService {
-	ApplicationMiddle get(String id);
-	boolean exist(String id);
-	int insert(ApplicationMiddle model);
-	int update(ApplicationMiddle model);
-	int delete(String id);
-	List<ApplicationMiddle> list();
-	Page<ApplicationMiddle> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<ApplicationMiddleDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<ApplicationMiddle> findByPersonId(String personId);
-	boolean existByIdCard(String idCard, String applicationId);
-
-	List<ApplicationMiddle> findByStudentId(String id);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/ApplicationPrimaryService.java

@@ -1,24 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface ApplicationPrimaryService {
-	ApplicationPrimary get(String id);
-	boolean exist(String id);
-	int insert(ApplicationPrimary model);
-	int update(ApplicationPrimary model);
-	int delete(String id);
-	List<ApplicationPrimary> list();
-	Page<ApplicationPrimary> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<ApplicationPrimaryDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    List<ApplicationPrimary> findByPersonId(String personId);
-    boolean existByIdCard(String idCard, String applicationId);
-
-	List<ApplicationPrimary> findByStudentId(String id);
-	ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/ApportionDetailService.java

@@ -1,21 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-
-public interface ApportionDetailService {
-	ApportionDetail get(String id);
-	boolean exist(String id);
-	int insert(ApportionDetail model);
-	int update(ApportionDetail model);
-	int delete(String id);
-	List<ApportionDetail> findByStudentId(String studentId);
-	List<ApportionDetail> list();
-	Page<ApportionDetail> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<ApportionDetailDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/ApportionService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.Apportion;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface ApportionService {
-	Apportion get(String id);
-	boolean exist(String id);
-	int insert(Apportion model);
-	int update(Apportion model);
-	int delete(String id);
-	List<Apportion> list();
-	Page<Apportion> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/ApprovalInfoService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface ApprovalInfoService {
-	ApprovalInfo get(String id);
-	boolean exist(String id);
-	int insert(ApprovalInfo model);
-	int update(ApprovalInfo model);
-	int delete(String id);
-	List<ApprovalInfo> list();
-	Page<ApprovalInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<ApprovalInfo> findByApplicationId(String applicationId);
-	List<ApprovalInfo> findByApplicationIdAndOperation(String applicationId,String operation);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/DistrictInfoService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-
-public interface DistrictInfoService {
-	DistrictInfo get(String id);
-	boolean exist(String id);
-	int insert(DistrictInfo model);
-	int update(DistrictInfo model);
-	int delete(String id);
-	List<DistrictInfo> list();
-	Page<DistrictInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    List<DistrictInfo> findByStreetId(String streetId);
-    List<DistrictInfo> findActiveByStreetId(String enrollmentType,String type, String streetId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/EnrollControlService.java

@@ -1,27 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.EnrollControl;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-17 13:15
- */
-public interface EnrollControlService {
-
-    EnrollControl get(String id);
-    boolean exist(String id);
-    int insert(EnrollControl model);
-    int update(EnrollControl model);
-    int delete(String id);
-    List<EnrollControl> list();
-    Page<EnrollControl> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-    List<EnrollControl> findBySchoolTypeAndStudentType(String schoolType, String studentType);
-
-    List<EnrollControl> searchParam(Map<String, Object> searchParams,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/NewsInfoService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.NewsInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface NewsInfoService {
-	NewsInfo get(String id);
-	boolean exist(String id);
-	int insert(NewsInfo model);
-	int update(NewsInfo model);
-	int delete(String id);
-	List<NewsInfo> list();
-	Page<NewsInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-
-    List<NewsInfo> findByTypeAndStatus(String type,String status);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/OfferInfoService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jpsoft.supervision.modules.base.entity.OfferInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-
-public interface OfferInfoService {
-	OfferInfo get(String id);
-	boolean exist(String id);
-	int insert(OfferInfo model);
-	int update(OfferInfo model);
-	int delete(String id);
-	int findMaxSerialNum(String schoolId,String enrollmentType);
-	List<OfferInfo> list();
-	Page<OfferInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/PersonInfoService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.PersonInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface PersonInfoService {
-	PersonInfo get(String id);
-	boolean exist(String id);
-	int insert(PersonInfo model);
-	int update(PersonInfo model);
-	int delete(String id);
-	List<PersonInfo> list();
-	Page<PersonInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    PersonInfo findByPhone(String phone);
-    PersonInfo findByOpenId(String openId);
-    PersonInfo findByIdCard(String idCard);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/PersonStudentService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.PersonStudent;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface PersonStudentService {
-	PersonStudent get(String id);
-	boolean exist(String id);
-	int insert(PersonStudent model);
-	int update(PersonStudent model);
-	int delete(String id);
-	List<PersonStudent> list();
-	Page<PersonStudent> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-    PersonStudent findByPersonIdAndStudentId(String personId, String studentId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/SchoolInfoService.java

@@ -1,23 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface SchoolInfoService {
-	SchoolInfo get(String id);
-	boolean exist(String id);
-	int insert(SchoolInfo model);
-	int update(SchoolInfo model);
-	int delete(String id);
-	List<SchoolInfo> list();
-	Page<SchoolInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    List<SchoolInfo> findByEnrollmentType(String enrollmentType);
-	long countByParentId(String parentId);
-	Boolean hasChildren(String parentId);
-	List<SchoolInfo> findByParentId(String parentId);
-	int updateParentIdNull(SchoolInfo model);
-    List<SchoolInfo> findActiveSchoolByEnrollmentType(String type, String enrollType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/SchoolRelationService.java

@@ -1,15 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
-
-import java.util.List;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-2 14:31
- */
-public interface SchoolRelationService {
-
-
-    List<SchoolRelation> findByPrimaryId(String primaryId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/StudentFilesService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.StudentFiles;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface StudentFilesService {
-	StudentFiles get(String id);
-	boolean exist(String id);
-	int insert(StudentFiles model);
-	int update(StudentFiles model);
-	int delete(String id);
-	List<StudentFiles> list();
-	Page<StudentFiles> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<StudentFiles> findByApplicationIdAndFileType(String applicationId, String fileType);
-    int deleteByApplicationIdAndFileType(String applicationId, String fileType);
-	List<String> findUrlByApplicationIdAndFileType(String applicationId, String fileType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/StudentInfoService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.StudentInfo;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface StudentInfoService {
-	StudentInfo get(String id);
-	boolean exist(String id);
-	int insert(StudentInfo model);
-	int update(StudentInfo model);
-	int delete(String id);
-	List<StudentInfo> list();
-	Page<StudentInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    StudentInfo findByIdCard(String idCard);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/AdjustDetailServiceImpl.java

@@ -1,80 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.AdjustDetailDAO;
-import com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
-import com.jpsoft.supervision.modules.base.service.AdjustDetailService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="adjustDetailService")
-public class AdjustDetailServiceImpl implements AdjustDetailService {
-	@Resource(name="adjustDetailDAO")
-	private AdjustDetailDAO adjustDetailDAO;
-
-	@Override
-	public AdjustDetail get(String id) {
-		// TODO Auto-generated method stub
-		return adjustDetailDAO.get(id);
-	}
-
-	@Override
-	public int insert(AdjustDetail model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return adjustDetailDAO.insert(model);
-	}
-
-	@Override
-	public int update(AdjustDetail model) {
-		// TODO Auto-generated method stub
-		return adjustDetailDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return adjustDetailDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = adjustDetailDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<AdjustDetail> list() {
-		// TODO Auto-generated method stub
-		return adjustDetailDAO.list();
-	}
-		
-	@Override
-	public Page<AdjustDetail> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<AdjustDetail> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            adjustDetailDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public Page<AdjustDetailDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-		Page<AdjustDetailDTO> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			adjustDetailDAO.pageSearchDTO(searchParams,sortList);
-		});
-
-		return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApplicationMiddleServiceImpl.java

@@ -1,97 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.ApplicationMiddleDAO;
-import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
-import com.jpsoft.supervision.modules.base.service.ApplicationMiddleService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="applicationMiddleService")
-public class ApplicationMiddleServiceImpl implements ApplicationMiddleService {
-	@Resource(name="applicationMiddleDAO")
-	private ApplicationMiddleDAO applicationMiddleDAO;
-
-	@Override
-	public ApplicationMiddle get(String id) {
-		// TODO Auto-generated method stub
-		return applicationMiddleDAO.get(id);
-	}
-
-	@Override
-	public int insert(ApplicationMiddle model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-
-		return applicationMiddleDAO.insert(model);
-	}
-
-	@Override
-	public int update(ApplicationMiddle model) {
-		// TODO Auto-generated method stub
-		return applicationMiddleDAO.update(model);
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return applicationMiddleDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = applicationMiddleDAO.exist(id);
-
-		return count > 0 ? true : false;
-	}
-
-	@Override
-	public List<ApplicationMiddle> list() {
-		// TODO Auto-generated method stub
-		return applicationMiddleDAO.list();
-	}
-
-	@Override
-	public Page<ApplicationMiddle> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ApplicationMiddle> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            applicationMiddleDAO.search(searchParams,sortList);
-        });
-
-        return page;
-	}
-
-	@Override
-	public Page<ApplicationMiddleDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-		Page<ApplicationMiddleDTO> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			applicationMiddleDAO.searchDTO(searchParams,sortList);
-		});
-
-		return page;
-	}
-
-	@Override
-	public List<ApplicationMiddle> findByPersonId(String personId) {
-		return applicationMiddleDAO.findByPersonId(personId);
-	}
-
-	@Override
-	public boolean existByIdCard(String idCard, String applicationId) {
-		long count = applicationMiddleDAO.existByIdCard(idCard, applicationId);
-
-		return count>0;
-	}
-
-	@Override
-	public List<ApplicationMiddle> findByStudentId(String id) {
-		return applicationMiddleDAO.findByStudentId(id);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApplicationPrimaryServiceImpl.java

@@ -1,102 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.ApplicationPrimaryDAO;
-import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
-import com.jpsoft.supervision.modules.base.service.ApplicationPrimaryService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="applicationPrimaryService")
-public class ApplicationPrimaryServiceImpl implements ApplicationPrimaryService {
-	@Resource(name="applicationPrimaryDAO")
-	private ApplicationPrimaryDAO applicationPrimaryDAO;
-
-	@Override
-	public ApplicationPrimary get(String id) {
-		// TODO Auto-generated method stub
-		return applicationPrimaryDAO.get(id);
-	}
-
-	@Override
-	public int insert(ApplicationPrimary model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-
-		return applicationPrimaryDAO.insert(model);
-	}
-
-	@Override
-	public int update(ApplicationPrimary model) {
-		// TODO Auto-generated method stub
-		return applicationPrimaryDAO.update(model);
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return applicationPrimaryDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = applicationPrimaryDAO.exist(id);
-
-		return count > 0 ? true : false;
-	}
-
-	@Override
-	public List<ApplicationPrimary> list() {
-		// TODO Auto-generated method stub
-		return applicationPrimaryDAO.list();
-	}
-
-	@Override
-	public Page<ApplicationPrimary> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ApplicationPrimary> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            applicationPrimaryDAO.search(searchParams,sortList);
-        });
-
-        return page;
-	}
-
-	@Override
-	public Page<ApplicationPrimaryDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-		Page<ApplicationPrimaryDTO> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			applicationPrimaryDAO.searchDTO(searchParams,sortList);
-		});
-
-		return page;
-	}
-
-	@Override
-	public List<ApplicationPrimary> findByPersonId(String personId) {
-		return applicationPrimaryDAO.findByPersonId(personId);
-	}
-
-	@Override
-	public boolean existByIdCard(String idCard, String applicationId) {
-		long count = applicationPrimaryDAO.existByIdCard(idCard, applicationId);
-
-		return count>0;
-	}
-
-	@Override
-	public List<ApplicationPrimary> findByStudentId(String id) {
-		return applicationPrimaryDAO.findByStudentId(id);
-	}
-
-	@Override
-	public ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId){
-		return applicationPrimaryDAO.findByStudentNameAndIdCard(studentName,idCard,schoolId);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApportionDetailServiceImpl.java

@@ -1,85 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.ApportionDetailDAO;
-import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
-import com.jpsoft.supervision.modules.base.service.ApportionDetailService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="apportionDetailService")
-public class ApportionDetailServiceImpl implements ApportionDetailService {
-	@Resource(name="apportionDetailDAO")
-	private ApportionDetailDAO apportionDetailDAO;
-
-	@Override
-	public ApportionDetail get(String id) {
-		// TODO Auto-generated method stub
-		return apportionDetailDAO.get(id);
-	}
-
-	@Override
-	public int insert(ApportionDetail model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return apportionDetailDAO.insert(model);
-	}
-
-	@Override
-	public int update(ApportionDetail model) {
-		// TODO Auto-generated method stub
-		return apportionDetailDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return apportionDetailDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = apportionDetailDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-
-	@Override
-	public List<ApportionDetail> findByStudentId(String studentId){
-		return apportionDetailDAO.findByStudentId(studentId);
-	}
-	
-	@Override
-	public List<ApportionDetail> list() {
-		// TODO Auto-generated method stub
-		return apportionDetailDAO.list();
-	}
-		
-	@Override
-	public Page<ApportionDetail> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ApportionDetail> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            apportionDetailDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public Page<ApportionDetailDTO> pageSearchDTO(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-		Page<ApportionDetailDTO> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			apportionDetailDAO.pageSearchDTO(searchParams,sortList);
-		});
-
-		return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApportionServiceImpl.java

@@ -1,70 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.ApportionDAO;
-import com.jpsoft.supervision.modules.base.entity.Apportion;
-import com.jpsoft.supervision.modules.base.service.ApportionService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="apportionService")
-public class ApportionServiceImpl implements ApportionService {
-	@Resource(name="apportionDAO")
-	private ApportionDAO apportionDAO;
-
-	@Override
-	public Apportion get(String id) {
-		// TODO Auto-generated method stub
-		return apportionDAO.get(id);
-	}
-
-	@Override
-	public int insert(Apportion model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return apportionDAO.insert(model);
-	}
-
-	@Override
-	public int update(Apportion model) {
-		// TODO Auto-generated method stub
-		return apportionDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return apportionDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = apportionDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Apportion> list() {
-		// TODO Auto-generated method stub
-		return apportionDAO.list();
-	}
-		
-	@Override
-	public Page<Apportion> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<Apportion> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            apportionDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApprovalInfoServiceImpl.java

@@ -1,81 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.ApprovalInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
-import com.jpsoft.supervision.modules.base.service.ApprovalInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="approvalInfoService")
-public class ApprovalInfoServiceImpl implements ApprovalInfoService {
-	@Resource(name="approvalInfoDAO")
-	private ApprovalInfoDAO approvalInfoDAO;
-
-	@Override
-	public ApprovalInfo get(String id) {
-		// TODO Auto-generated method stub
-		return approvalInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(ApprovalInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return approvalInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(ApprovalInfo model) {
-		// TODO Auto-generated method stub
-		return approvalInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return approvalInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = approvalInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<ApprovalInfo> list() {
-		// TODO Auto-generated method stub
-		return approvalInfoDAO.list();
-	}
-		
-	@Override
-	public Page<ApprovalInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ApprovalInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            approvalInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<ApprovalInfo> findByApplicationId(String applicationId) {
-		// TODO Auto-generated method stub
-		return approvalInfoDAO.findByApplicationId(applicationId);
-	}
-
-	@Override
-	public List<ApprovalInfo> findByApplicationIdAndOperation(String applicationId,String operation){
-		return approvalInfoDAO.findByApplicationIdAndOperation(applicationId,operation);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/DistrictInfoServiceImpl.java

@@ -1,80 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.DistrictInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
-import com.jpsoft.supervision.modules.base.service.DistrictInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="districtInfoService")
-public class DistrictInfoServiceImpl implements DistrictInfoService {
-	@Resource(name="districtInfoDAO")
-	private DistrictInfoDAO districtInfoDAO;
-
-	@Override
-	public DistrictInfo get(String id) {
-		// TODO Auto-generated method stub
-		return districtInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(DistrictInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return districtInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(DistrictInfo model) {
-		// TODO Auto-generated method stub
-		return districtInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return districtInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = districtInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<DistrictInfo> list() {
-		// TODO Auto-generated method stub
-		return districtInfoDAO.list();
-	}
-		
-	@Override
-	public Page<DistrictInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<DistrictInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            districtInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<DistrictInfo> findByStreetId(String streetId) {
-		return districtInfoDAO.findByStreetId(streetId);
-	}
-
-	@Override
-	public List<DistrictInfo> findActiveByStreetId(String enrollmentType,String type, String streetId) {
-		return districtInfoDAO.findActiveByStreetId(enrollmentType,type,streetId);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/EnrollControlServiceImpl.java

@@ -1,85 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.jpsoft.supervision.modules.base.dao.EnrollControlDAO;
-import com.jpsoft.supervision.modules.base.entity.EnrollControl;
-import com.jpsoft.supervision.modules.base.service.EnrollControlService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-17 13:15
- */
-@Transactional
-@Component(value="enrollControlService")
-public class EnrollControlServiceImpl implements EnrollControlService {
-
-    @Resource(name="enrollControlDAO")
-    private EnrollControlDAO enrollControlDAO;
-
-    @Override
-    public EnrollControl get(String id) {
-        // TODO Auto-generated method stub
-        return enrollControlDAO.get(id);
-    }
-
-    @Override
-    public int insert(EnrollControl model) {
-        // TODO Auto-generated method stub
-        //model.setId(UUID.randomUUID().toString());
-
-        return enrollControlDAO.insert(model);
-    }
-
-    @Override
-    public int update(EnrollControl model) {
-        // TODO Auto-generated method stub
-        return enrollControlDAO.update(model);
-    }
-
-    @Override
-    public int delete(String id) {
-        // TODO Auto-generated method stub
-        return enrollControlDAO.delete(id);
-    }
-
-    @Override
-    public boolean exist(String id) {
-        // TODO Auto-generated method stub
-        int count = enrollControlDAO.exist(id);
-
-        return count > 0 ? true : false;
-    }
-
-    @Override
-    public List<EnrollControl> list() {
-        // TODO Auto-generated method stub
-        return enrollControlDAO.list();
-    }
-
-    @Override
-    public Page<EnrollControl> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-        Page<EnrollControl> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            enrollControlDAO.search(searchParams,sortList);
-        });
-
-        return page;
-    }
-
-    @Override
-    public List<EnrollControl> findBySchoolTypeAndStudentType(String schoolType, String studentType) {
-        return enrollControlDAO.findBySchoolTypeAndStudentType(schoolType,studentType);
-    }
-
-    @Override
-    public List<EnrollControl> searchParam(Map<String, Object> searchParams,List<Sort> sortList) {
-        return enrollControlDAO.search(searchParams,sortList);
-    }
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/NewsInfoServiceImpl.java

@@ -1,75 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.NewsInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.NewsInfo;
-import com.jpsoft.supervision.modules.base.service.NewsInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="newsInfoService")
-public class NewsInfoServiceImpl implements NewsInfoService {
-	@Resource(name="newsInfoDAO")
-	private NewsInfoDAO newsInfoDAO;
-
-	@Override
-	public NewsInfo get(String id) {
-		// TODO Auto-generated method stub
-		return newsInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(NewsInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-
-		return newsInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(NewsInfo model) {
-		// TODO Auto-generated method stub
-		return newsInfoDAO.update(model);
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return newsInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = newsInfoDAO.exist(id);
-
-		return count > 0 ? true : false;
-	}
-
-	@Override
-	public List<NewsInfo> list() {
-		// TODO Auto-generated method stub
-		return newsInfoDAO.list();
-	}
-
-	@Override
-	public Page<NewsInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<NewsInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            newsInfoDAO.search(searchParams,sortList);
-        });
-
-        return page;
-	}
-
-	@Override
-	public List<NewsInfo> findByTypeAndStatus(String type,String status) {
-		return newsInfoDAO.findByTypeAndStatus(type,status);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/OfferInfoServiceImpl.java

@@ -1,76 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.OfferInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.OfferInfo;
-import com.jpsoft.supervision.modules.base.service.OfferInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="offerInfoService")
-public class OfferInfoServiceImpl implements OfferInfoService {
-	@Resource(name="offerInfoDAO")
-	private OfferInfoDAO offerInfoDAO;
-
-	@Override
-	public OfferInfo get(String id) {
-		// TODO Auto-generated method stub
-		return offerInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(OfferInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return offerInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(OfferInfo model) {
-		// TODO Auto-generated method stub
-		return offerInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return offerInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = offerInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<OfferInfo> list() {
-		// TODO Auto-generated method stub
-		return offerInfoDAO.list();
-	}
-
-	@Override
-	public int findMaxSerialNum(String schoolId,String enrollmentType){
-		return offerInfoDAO.findMaxSerialNum(schoolId,enrollmentType);
-	}
-		
-	@Override
-	public Page<OfferInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<OfferInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            offerInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/PersonInfoServiceImpl.java

@@ -1,85 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.PersonInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.PersonInfo;
-import com.jpsoft.supervision.modules.base.service.PersonInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="personInfoService")
-public class PersonInfoServiceImpl implements PersonInfoService {
-	@Resource(name="personInfoDAO")
-	private PersonInfoDAO personInfoDAO;
-
-	@Override
-	public PersonInfo get(String id) {
-		// TODO Auto-generated method stub
-		return personInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(PersonInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return personInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(PersonInfo model) {
-		// TODO Auto-generated method stub
-		return personInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return personInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = personInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<PersonInfo> list() {
-		// TODO Auto-generated method stub
-		return personInfoDAO.list();
-	}
-		
-	@Override
-	public Page<PersonInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<PersonInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            personInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public PersonInfo findByPhone(String phone) {
-		return personInfoDAO.findByPhone(phone);
-	}
-
-	@Override
-	public PersonInfo findByOpenId(String openId) {
-		return personInfoDAO.findByOpenId(openId);
-	}
-
-	@Override
-	public PersonInfo findByIdCard(String idCard) {
-		return personInfoDAO.findByIdCard(idCard);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/PersonStudentServiceImpl.java

@@ -1,75 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.PersonStudentDAO;
-import com.jpsoft.supervision.modules.base.entity.PersonStudent;
-import com.jpsoft.supervision.modules.base.service.PersonStudentService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="personStudentService")
-public class PersonStudentServiceImpl implements PersonStudentService {
-	@Resource(name="personStudentDAO")
-	private PersonStudentDAO personStudentDAO;
-
-	@Override
-	public PersonStudent get(String id) {
-		// TODO Auto-generated method stub
-		return personStudentDAO.get(id);
-	}
-
-	@Override
-	public int insert(PersonStudent model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return personStudentDAO.insert(model);
-	}
-
-	@Override
-	public int update(PersonStudent model) {
-		// TODO Auto-generated method stub
-		return personStudentDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return personStudentDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = personStudentDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<PersonStudent> list() {
-		// TODO Auto-generated method stub
-		return personStudentDAO.list();
-	}
-		
-	@Override
-	public Page<PersonStudent> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<PersonStudent> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            personStudentDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public PersonStudent findByPersonIdAndStudentId(String personId, String studentId) {
-		return personStudentDAO.findByPersonIdAndStudentId(personId,studentId);
-}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/SchoolInfoServiceImpl.java

@@ -1,101 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.SchoolInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
-import com.jpsoft.supervision.modules.base.service.SchoolInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="schoolInfoService")
-public class SchoolInfoServiceImpl implements SchoolInfoService {
-	@Resource(name="schoolInfoDAO")
-	private SchoolInfoDAO schoolInfoDAO;
-
-	@Override
-	public SchoolInfo get(String id) {
-		// TODO Auto-generated method stub
-		return schoolInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(SchoolInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return schoolInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(SchoolInfo model) {
-		// TODO Auto-generated method stub
-		return schoolInfoDAO.update(model);
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return schoolInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = schoolInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<SchoolInfo> list() {
-		// TODO Auto-generated method stub
-		return schoolInfoDAO.list();
-	}
-		
-	@Override
-	public Page<SchoolInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<SchoolInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            schoolInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<SchoolInfo> findByEnrollmentType(String enrollmentType) {
-		return schoolInfoDAO.findByEnrollmentType(enrollmentType);
-	}
-
-	@Override
-	public long countByParentId(String parentId) {
-		return schoolInfoDAO.countByParentId(parentId);
-	}
-
-	@Override
-	public Boolean hasChildren(String id) {
-		return countByParentId(id)>0;
-	}
-
-	@Override
-	public List<SchoolInfo> findByParentId(String parentId) {
-		return schoolInfoDAO.findByParentId(parentId);
-	}
-
-	@Override
-	public int updateParentIdNull(SchoolInfo model) {
-		// TODO Auto-generated method stub
-		return schoolInfoDAO.updateParentIdNull(model);
-	}
-
-	@Override
-	public List<SchoolInfo> findActiveSchoolByEnrollmentType(String type, String enrollmentType) {
-		return schoolInfoDAO.findActiveSchoolByEnrollmentType(type,enrollmentType);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/SchoolRelationServiceImpl.java

@@ -1,27 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import com.jpsoft.supervision.modules.base.dao.SchoolRelationDAO;
-import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
-import com.jpsoft.supervision.modules.base.service.SchoolRelationService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-2 14:31
- */
-@Component(value="schoolRelationService")
-@Transactional
-public class SchoolRelationServiceImpl implements SchoolRelationService {
-
-    @Resource
-    private SchoolRelationDAO schoolRelationDAO;
-
-    @Override
-    public List<SchoolRelation> findByPrimaryId(String primaryId) {
-        return schoolRelationDAO.findByPrimaryId(primaryId);
-    }
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/StudentFilesServiceImpl.java

@@ -1,85 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.StudentFilesDAO;
-import com.jpsoft.supervision.modules.base.entity.StudentFiles;
-import com.jpsoft.supervision.modules.base.service.StudentFilesService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="studentFilesService")
-public class StudentFilesServiceImpl implements StudentFilesService {
-	@Resource(name="studentFilesDAO")
-	private StudentFilesDAO studentFilesDAO;
-
-	@Override
-	public StudentFiles get(String id) {
-		// TODO Auto-generated method stub
-		return studentFilesDAO.get(id);
-	}
-
-	@Override
-	public int insert(StudentFiles model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return studentFilesDAO.insert(model);
-	}
-
-	@Override
-	public int update(StudentFiles model) {
-		// TODO Auto-generated method stub
-		return studentFilesDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return studentFilesDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = studentFilesDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<StudentFiles> list() {
-		// TODO Auto-generated method stub
-		return studentFilesDAO.list();
-	}
-		
-	@Override
-	public Page<StudentFiles> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<StudentFiles> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            studentFilesDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<StudentFiles> findByApplicationIdAndFileType(String applicationId, String fileType) {
-		return studentFilesDAO.findByApplicationIdAndFileType(applicationId,fileType);
-	}
-
-	@Override
-	public int deleteByApplicationIdAndFileType(String applicationId, String fileType) {
-		return studentFilesDAO.deleteByApplicationIdAndFileType(applicationId, fileType);
-	}
-
-	@Override
-	public List<String> findUrlByApplicationIdAndFileType(String applicationId, String fileType) {
-		return studentFilesDAO.findUrlByApplicationIdAndFileType(applicationId,fileType);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/StudentInfoServiceImpl.java

@@ -1,75 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-
-import com.jpsoft.supervision.modules.base.dao.StudentInfoDAO;
-import com.jpsoft.supervision.modules.base.entity.StudentInfo;
-import com.jpsoft.supervision.modules.base.service.StudentInfoService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="studentInfoService")
-public class StudentInfoServiceImpl implements StudentInfoService {
-	@Resource(name="studentInfoDAO")
-	private StudentInfoDAO studentInfoDAO;
-
-	@Override
-	public StudentInfo get(String id) {
-		// TODO Auto-generated method stub
-		return studentInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(StudentInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return studentInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(StudentInfo model) {
-		// TODO Auto-generated method stub
-		return studentInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return studentInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = studentInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<StudentInfo> list() {
-		// TODO Auto-generated method stub
-		return studentInfoDAO.list();
-	}
-		
-	@Override
-	public Page<StudentInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<StudentInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            studentInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public StudentInfo findByIdCard(String idCard) {
-		return studentInfoDAO.findByIdCard(idCard);
-	}
-}

common/src/main/resources/mapper/base/AdjustDetail.xml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.AdjustDetailDAO">
-	<resultMap id="AdjustDetailMap" type="com.jpsoft.supervision.modules.base.entity.AdjustDetail">
-		<id property="id" column="id_" />
-			<result property="applicationId" column="application_id" />
-			<result property="studentId" column="student_id" />
-			<result property="personId" column="person_id" />
-			<result property="schoolId" column="school_id" />
-			<result property="delFlag" column="del_flag" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.AdjustDetail">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_adjust_detail
-	    (id_,application_id,student_id,person_id,school_id,del_flag,create_by,create_time,update_by,update_time)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{applicationId,jdbcType=VARCHAR}
-,#{studentId,jdbcType=VARCHAR}
-,#{personId,jdbcType=VARCHAR}
-,#{schoolId,jdbcType=VARCHAR}
-,#{delFlag,jdbcType= NUMERIC }
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_adjust_detail where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.AdjustDetail">
-		update base_adjust_detail
-		<set>
-				<if test="applicationId!=null">
-		application_id=#{applicationId,jdbcType=VARCHAR},
-		</if>
-				<if test="studentId!=null">
-		student_id=#{studentId,jdbcType=VARCHAR},
-		</if>
-				<if test="personId!=null">
-		person_id=#{personId,jdbcType=VARCHAR},
-		</if>
-				<if test="schoolId!=null">
-		school_id=#{schoolId,jdbcType=VARCHAR},
-		</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="AdjustDetailMap">
-		select 
-id_,application_id,student_id,person_id,school_id,del_flag,create_by,create_time,update_by,update_time		from base_adjust_detail where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_adjust_detail where id_=#{0}
-	</select>
-	<select id="list" resultMap="AdjustDetailMap">
-		select * from base_adjust_detail
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="AdjustDetailMap">
-		<![CDATA[
-			select * from base_adjust_detail
-		]]>
-		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-	<resultMap id="AdjustDetailDTOMap" type="com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO">
-		<id property="id" column="id_" />
-		<result property="studentName" column="studentName" />
-		<result property="studentCardType" column="studentCardType" />
-		<result property="studentIdCard" column="studentIdCard" />
-		<result property="typeName" column="typeName" />
-		<result property="schoolName" column="schoolName" />
-		<result property="statusName" column="statusName" />
-		<result property="offerName" column="offerName" />
-	</resultMap>
-	<select id="pageSearchDTO" parameterType="hashmap" resultMap="AdjustDetailDTOMap">
-		<![CDATA[
-			SELECT a.id_,b.name_ AS studentName,g.name_ AS studentCardType,b.id_card AS studentIdCard,d.name_ AS typeName,e.name_ AS schoolName,h.name_ AS statusName,f.name_ AS offerName FROM base_adjust_detail a
-			LEFT JOIN base_student_info b ON a.student_id = b.id_
-			LEFT JOIN base_application_primary c ON a.application_id = c.id_
-			LEFT JOIN sys_data_dictionary d ON c.category_id = d.id_
-			LEFT JOIN base_school_info e ON a.school_id = e.id_
-			LEFT JOIN base_school_info f ON c.offer_id = f.id_
-			LEFT JOIN sys_data_dictionary g ON (b.card_type = g.value_ AND g.parent_id = '1f0a58b9-5338-47ef-9233-a4539cc00010')
-			LEFT JOIN sys_data_dictionary h ON (c.status_ = h.value_ AND h.parent_id = '13e5b15f-8d10-44af-99f4-f05c9afd64eb')
-		]]>
-		<where>
-			<if test="searchParams.schoolId != null">
-				and c.school_id = #{searchParams.schoolId}
-			</if>
-			<if test="searchParams.idCardOrName != null">
-				and (b.id_card = #{searchParams.idCardOrName} or b.name_ = #{searchParams.idCardOrName})
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-			${sort.name} ${sort.order}
-		</foreach>
-	</select>
-</mapper>

common/src/main/resources/mapper/base/ApplicationMiddle.xml

@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.ApplicationMiddleDAO">
-    <resultMap id="ApplicationMiddleMap" type="com.jpsoft.supervision.modules.base.entity.ApplicationMiddle">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="type" column="type_"/>
-        <result property="status" column="status_"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="nowAddress" column="now_address"/>
-        <result property="personId" column="person_id"/>
-        <result property="schoolId" column="school_id"/>
-        <result property="studentId" column="student_id"/>
-        <result property="streetId" column="street_id"/>
-        <result property="communityId" column="community_id"/>
-        <result property="chooseReason" column="choose_reason"/>
-        <result property="hit" column="hit_"/>
-        <result property="offerId" column="offer_id"/>
-        <result property="offerName" column="offer_name"/>
-        <result property="offerCode" column="offer_code"/>
-        <result property="isSend" column="is_send"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="offerImg" column="offer_img"/>
-        <result property="newType" column="new_type"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.ApplicationMiddle">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_application_middle
-	    (id_,create_by,create_time,update_by,update_time,del_flag,type_,status_,category_id,now_address,person_id,school_id,student_id,street_id,community_id,choose_reason,hit_,offer_id,
-	    is_send,send_time,offer_code,offer_img,new_type
-	    )
-		values
-		(
-            #{id,jdbcType= VARCHAR }
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{type,jdbcType=VARCHAR}
-            ,#{status,jdbcType=VARCHAR}
-            ,#{categoryId,jdbcType=VARCHAR}
-            ,#{nowAddress,jdbcType=VARCHAR}
-            ,#{personId,jdbcType=VARCHAR}
-            ,#{schoolId,jdbcType=VARCHAR}
-            ,#{studentId,jdbcType=VARCHAR}
-            ,#{streetId,jdbcType=VARCHAR}
-            ,#{communityId,jdbcType=VARCHAR}
-            ,#{chooseReason,jdbcType=VARCHAR}
-            ,#{hit,jdbcType=VARCHAR}
-            ,#{offerId,jdbcType=VARCHAR}
-			,#{isSend,jdbcType=NUMERIC}
-			,#{sendTime,jdbcType=TIMESTAMP}
-			,#{offerCode,jdbcType=VARCHAR}
-			,#{offerImg,jdbcType=VARCHAR}
-			,#{newType,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="long">
-		delete from base_application_middle where id_=#{id,jdbcType=NUMERIC}
-	</delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.ApplicationMiddle">
-        update base_application_middle
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="type!=null">
-                type_=#{type,jdbcType=VARCHAR},
-            </if>
-            <if test="status!=null">
-                status_=#{status,jdbcType=VARCHAR},
-            </if>
-            <if test="categoryId!=null">
-                category_id=#{categoryId,jdbcType=VARCHAR},
-            </if>
-            <if test="nowAddress!=null">
-                now_address=#{nowAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="personId!=null">
-                person_id=#{personId,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolId!=null">
-                school_id=#{schoolId,jdbcType=VARCHAR},
-            </if>
-            <if test="studentId!=null">
-                student_id=#{studentId,jdbcType=VARCHAR},
-            </if>
-            <if test="streetId!=null">
-                street_id=#{streetId,jdbcType=VARCHAR},
-            </if>
-            <if test="communityId!=null">
-                community_id=#{communityId,jdbcType=VARCHAR},
-            </if>
-            <if test="chooseReason != null">
-                choose_reason=#{chooseReason,jdbcType=VARCHAR},
-            </if>
-            <if test="hit != null">
-                hit_=#{hit,jdbcType=VARCHAR},
-            </if>
-            <if test="offerId!=null">
-                offer_id=#{offerId,jdbcType=VARCHAR},
-            </if>
-            <if test="isSend!=null">
-                is_send=#{isSend,jdbcType=NUMERIC},
-            </if>
-            <if test="sendTime!=null">
-                send_time=#{sendTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="offerCode!=null">
-                offer_code=#{offerCode,jdbcType=VARCHAR},
-            </if>
-            <if test="offerImg!=null">
-                offer_img=#{offerImg,jdbcType=VARCHAR},
-            </if>
-            <if test="newType!=null">
-                new_type=#{newType,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="existByIdCard" resultType="long">
-        select count(*) from base_application_middle a,base_student_info b
-        where a.student_id = b.id_
-        and b.id_card = #{idCard}
-        and a.del_flag=0
-        and b.del_flag=0
-        <if test="applicationId!=null">
-            <![CDATA[
-                and a.id_<>#{applicationId}
-            ]]>
-        </if>
-    </select>
-    <select id="get" parameterType="string" resultMap="ApplicationMiddleMap">
-		select * from base_application_middle where id_=#{0}
-	</select>
-    <select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_application_middle where id_=#{0}
-	</select>
-    <select id="list" resultMap="ApplicationMiddleMap">
-		select * from base_application_middle
-	</select>
-    <select id="search" parameterType="hashmap" resultMap="ApplicationMiddleMap">
-        <![CDATA[
-			select * from base_application_middle
-		]]>
-        <where>
-            <if test="searchParams.delFlag != null">
-                and del_flag like #{searchParams.delFlag}
-            </if>
-            <if test="searchParams.type != null">
-                and type_ like #{searchParams.type}
-            </if>
-            <if test="searchParams.name != null">
-                and name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.idCard != null">
-                and id_card like #{searchParams.idCard}
-            </if>
-            <if test="searchParams.schoolId != null">
-                and school_id = #{searchParams.schoolId}
-            </if>
-            <if test="searchParams.categoryId != null">
-                and category_id like #{searchParams.categoryId}
-            </if>
-            <if test="searchParams.status != null">
-                and status_ = #{searchParams.status}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-
-    <resultMap id="ApplicationMiddleDTOMap" type="com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO">
-        <id property="applicationId" column="id_"/>
-        <result property="name" column="name_"/>
-        <result property="cardType" column="card_type"/>
-        <result property="idCard" column="id_card"/>
-        <result property="relationship" column="relationship_"/>
-        <result property="type" column="type_"/>
-        <result property="status" column="status_"/>
-        <result property="studentId" column="student_id"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="personId" column="person_id"/>
-        <result property="address" column="address_"/>
-        <result property="isSend" column="is_send"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="offerId" column="offer_id"/>
-        <result property="offerName" column="offer_name"/>
-        <result property="offerCode" column="offer_code"/>
-        <result property="offerImg" column="offer_img"/>
-        <result property="personName" column="person_name"/>
-        <result property="personPhone" column="person_phone"/>
-    </resultMap>
-    <select id="searchDTO" parameterType="hashmap" resultMap="ApplicationMiddleDTOMap">
-        <![CDATA[
-			SELECT a.id_,b.name_,b.card_type,b.id_card,
-			c.relationship_,a.type_,a.status_,a.student_id ,
-			a.create_time,a.update_time,
-			d.name_ as school_name,
-			a.person_id,
-			b.address_,
-			a.is_send,
-			a.send_time,
-			a.category_id,
-			a.offer_id,
-			e.name_ as offer_name,
-			a.offer_code,
-			a.offer_img,
-			f.name_ as person_name,
-			f.phone_ as person_phone
-			FROM base_application_middle a
-			LEFT JOIN base_student_info b ON a.student_id = b.id_
-			LEFT JOIN base_person_student c ON (a.person_id = c.person_id AND a.student_id = c.student_id)
-			LEFT JOIN base_school_info d ON a.school_id = d.id_
-			LEFT JOIN base_school_info e ON a.offer_id = e.id_
-			LEFT JOIN base_person_info f ON a.person_id = f.id_
-		]]>
-        <where>
-            <if test="searchParams.delFlag != null">
-                and a.del_flag = #{searchParams.delFlag}
-            </if>
-            <if test="searchParams.type != null">
-                and a.type_ like #{searchParams.type}
-            </if>
-
-            <if test="searchParams.tabStatus != null">
-                and a.status_ like #{searchParams.tabStatus}
-            </if>
-            <if test="searchParams.status != null">
-                and a.status_ like #{searchParams.status}
-            </if>
-            <if test="searchParams.name != null">
-                and b.name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.idCard != null">
-                and b.id_card like #{searchParams.idCard}
-            </if>
-            <if test="searchParams.nameOrIdCard != null">
-                and (b.id_card like #{searchParams.nameOrIdCard} or b.name_ like #{searchParams.nameOrIdCard})
-            </if>
-            <if test="searchParams.cardType != null">
-                and b.card_type = #{searchParams.cardType}
-            </if>
-			<if test="searchParams.schoolId != null">
-				and a.school_id like #{searchParams.schoolId}
-			</if>
-			<if test="searchParams.code != null">
-				and d.code_ like #{searchParams.code}
-			</if>
-            <if test="searchParams.startStatus != null">
-                <![CDATA[
-                    AND CONVERT(a.status_,SIGNED) >= #{searchParams.startStatus}
-                ]]>
-            </if>
-            <if test="searchParams.endStatus != null">
-                <![CDATA[
-                    AND CONVERT(a.status_,SIGNED) <= #{searchParams.endStatus}
-                ]]>
-            </if>
-            <if test="searchParams.orStatus != null">
-                <foreach item="status" collection="searchParams.orStatus" open="and (" separator="or" close=")">
-                    a.status_ = #{status}
-                </foreach>
-            </if>
-            <if test="searchParams.offerId != null">
-                and a.offer_id = #{searchParams.offerId}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByPersonId" resultMap="ApplicationMiddleMap">
-		select * from base_application_middle
-		where person_id=#{0} and del_flag=0
-		order by create_time asc
-	</select>
-
-    <select id="findByStudentId" resultMap="ApplicationMiddleMap">
-        select * from base_application_middle
-        where student_id=#{0} and del_flag=0
-        order by create_time asc
-    </select>
-</mapper>

common/src/main/resources/mapper/base/ApplicationPrimary.xml

@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.ApplicationPrimaryDAO">
-    <resultMap id="ApplicationPrimaryMap" type="com.jpsoft.supervision.modules.base.entity.ApplicationPrimary">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="type" column="type_"/>
-        <result property="hit" column="hit_"/>
-        <result property="status" column="status_"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="nowAddress" column="now_address"/>
-        <result property="personId" column="person_id"/>
-        <result property="studentId" column="student_id"/>
-        <result property="streetId" column="street_id"/>
-        <result property="communityId" column="community_id"/>
-        <result property="schoolId" column="school_id"/>
-        <result property="offerId" column="offer_id"/>
-        <result property="offerName" column="offer_name"/>
-        <result property="offerCode" column="offer_code"/>
-        <result property="isSend" column="is_send"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="offerImg" column="offer_img"/>
-        <result property="newType" column="new_type"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.ApplicationPrimary">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_application_primary
-	    (id_,create_by,create_time,update_by,update_time,del_flag,type_,
-	    status_,category_id,now_address,person_id,student_id,street_id,community_id,school_id,hit_,offer_id,
-	    is_send,send_time,offer_code,offer_img,new_type
-	    )
-		values
-		(
-			#{id,jdbcType= VARCHAR }
-			,#{createBy,jdbcType=VARCHAR}
-			,#{createTime,jdbcType= TIMESTAMP }
-			,#{updateBy,jdbcType=VARCHAR}
-			,#{updateTime,jdbcType= TIMESTAMP }
-			,#{delFlag,jdbcType= NUMERIC }
-			,#{type,jdbcType=VARCHAR}
-			,#{status,jdbcType=VARCHAR}
-			,#{categoryId,jdbcType=VARCHAR}
-			,#{nowAddress,jdbcType=VARCHAR}
-			,#{personId,jdbcType=VARCHAR}
-			,#{studentId,jdbcType=VARCHAR}
-			,#{streetId,jdbcType=VARCHAR}
-			,#{communityId,jdbcType=VARCHAR}
-			,#{schoolId,jdbcType=VARCHAR}
-			,#{hit,jdbcType= NUMERIC }
-			,#{offerId,jdbcType=VARCHAR}
-			,#{isSend,jdbcType=NUMERIC}
-			,#{sendTime,jdbcType=TIMESTAMP}
-			,#{offerCode,jdbcType=VARCHAR}
-			,#{offerImg,jdbcType=VARCHAR}
-			,#{newType,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="long">
-        delete from base_application_primary where id_=#{id,jdbcType=NUMERIC}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.ApplicationPrimary">
-        update base_application_primary
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="type!=null">
-                type_=#{type,jdbcType=VARCHAR},
-            </if>
-            <if test="hit!=null">
-                hit_=#{hit,jdbcType= NUMERIC },
-            </if>
-            <if test="status!=null">
-                status_=#{status,jdbcType=VARCHAR},
-            </if>
-            <if test="categoryId!=null">
-                category_id=#{categoryId,jdbcType=VARCHAR},
-            </if>
-            <if test="nowAddress!=null">
-                now_address=#{nowAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="personId!=null">
-                person_id=#{personId,jdbcType=VARCHAR},
-            </if>
-            <if test="studentId!=null">
-                student_id=#{studentId,jdbcType=VARCHAR},
-            </if>
-            <if test="streetId!=null">
-                street_id=#{streetId,jdbcType=VARCHAR},
-            </if>
-            <if test="communityId!=null">
-                community_id=#{communityId,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolId!=null">
-                school_id=#{schoolId,jdbcType=VARCHAR},
-            </if>
-            <if test="offerId!=null">
-                offer_id=#{offerId,jdbcType=VARCHAR},
-            </if>
-            <if test="isSend!=null">
-                is_send=#{isSend,jdbcType=NUMERIC},
-            </if>
-            <if test="sendTime!=null">
-                send_time=#{sendTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="offerCode!=null">
-                offer_code=#{offerCode,jdbcType=TIMESTAMP},
-            </if>
-            <if test="offerImg!=null">
-                offer_img=#{offerImg,jdbcType=VARCHAR},
-            </if>
-            <if test="newType!=null">
-                new_type=#{newType,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="existByIdCard" resultType="long">
-        select count(*) from base_application_primary a,base_student_info b
-        where a.student_id = b.id_
-        and b.id_card = #{idCard}
-        and a.del_flag=0
-        and b.del_flag=0
-        <if test="applicationId!=null">
-            <![CDATA[
-                and a.id_<>#{applicationId}
-            ]]>
-        </if>
-    </select>
-    <select id="get" parameterType="string" resultMap="ApplicationPrimaryMap">
-        select * from base_application_primary where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_application_primary where id_=#{0}
-    </select>
-    <select id="list" resultMap="ApplicationPrimaryMap">
-        select * from base_application_primary
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="ApplicationPrimaryMap">
-        <![CDATA[
-			SELECT * FROM base_application_primary
-		]]>
-        <where>
-            and del_flag = 0
-            <if test="searchParams.type != null">
-                and type_ like #{searchParams.type}
-            </if>
-            <if test="searchParams.name != null">
-                and name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.idCard != null">
-                and id_card like #{searchParams.idCard}
-            </if>
-            <if test="searchParams.schoolId != null">
-                and school_id = #{searchParams.schoolId}
-            </if>
-            <if test="searchParams.categoryId != null">
-                and category_id like #{searchParams.categoryId}
-            </if>
-            <if test="searchParams.status != null">
-                and status_ = #{searchParams.status}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-
-    <resultMap id="ApplicationPrimaryDTOMap" type="com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO">
-        <id property="applicationId" column="id_"/>
-        <result property="name" column="name_"/>
-        <result property="cardType" column="card_type"/>
-        <result property="idCard" column="id_card"/>
-        <result property="relationship" column="relationship_"/>
-        <result property="type" column="type_"/>
-        <result property="status" column="status_"/>
-        <result property="studentId" column="student_id"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="personId" column="person_id"/>
-        <result property="address" column="address_"/>
-        <result property="isSend" column="is_send"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="offerId" column="offer_id"/>
-        <result property="offerName" column="offer_name"/>
-        <result property="offerCode" column="offer_code"/>
-        <result property="offerImg" column="offer_img"/>
-        <result property="personName" column="person_name"/>
-        <result property="personPhone" column="person_phone"/>
-
-    </resultMap>
-    <select id="searchDTO" parameterType="hashmap" resultMap="ApplicationPrimaryDTOMap">
-        <![CDATA[
-			SELECT a.id_,b.name_,b.card_type,b.id_card,
-			c.relationship_,a.type_,a.status_,a.student_id ,
-			a.create_time,a.update_time,
-			d.name_ as school_name,
-			a.person_id,
-			b.address_,
-			a.is_send,
-			a.send_time,
-			a.category_id,
-			a.offer_id,
-			e.name_ as offer_name,
-			a.offer_code,
-			a.offer_img,
-			f.name_ as person_name,
-			f.phone_ as person_phone
-			FROM base_application_primary a
-			LEFT JOIN base_student_info b ON a.student_id = b.id_
-			LEFT JOIN base_person_student c ON (a.person_id = c.person_id AND a.student_id = c.student_id)
-			LEFT JOIN base_school_info d ON a.school_id = d.id_
-			LEFT JOIN base_school_info e ON a.offer_id = e.id_
-			LEFT JOIN base_person_info f ON a.person_id = f.id_
-		]]>
-        <where>
-            <if test="searchParams.delFlag != null">
-                and a.del_flag = #{searchParams.delFlag}
-            </if>
-            <if test="searchParams.type != null">
-                and a.type_ like #{searchParams.type}
-            </if>
-
-            <if test="searchParams.tabStatus != null">
-                and a.status_ like #{searchParams.tabStatus}
-            </if>
-            <if test="searchParams.status != null">
-                and a.status_ like #{searchParams.status}
-            </if>
-            <if test="searchParams.name != null">
-                and b.name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.idCard != null">
-                and b.id_card like #{searchParams.idCard}
-            </if>
-            <if test="searchParams.nameOrIdCard != null">
-                and (b.id_card like #{searchParams.nameOrIdCard} or b.name_ like #{searchParams.nameOrIdCard})
-            </if>
-            <if test="searchParams.cardType != null">
-                and b.card_type = #{searchParams.cardType}
-            </if>
-            <if test="searchParams.schoolId != null">
-                and a.school_id like #{searchParams.schoolId}
-            </if>
-            <if test="searchParams.code != null">
-                and d.code_ like #{searchParams.code}
-            </if>
-            <if test="searchParams.startStatus != null">
-                <![CDATA[
-                    AND CONVERT(a.status_,SIGNED) >= #{searchParams.startStatus}
-                ]]>
-            </if>
-            <if test="searchParams.endStatus != null">
-                <![CDATA[
-                    AND CONVERT(a.status_,SIGNED) <= #{searchParams.endStatus}
-                ]]>
-            </if>
-            <if test="searchParams.orStatus != null">
-                <foreach item="status" collection="searchParams.orStatus" open="and (" separator="or" close=")">
-                    a.status_ = #{status}
-                </foreach>
-            </if>
-            <if test="searchParams.categoryId != null">
-                and a.category_id = #{searchParams.categoryId}
-            </if>
-            <if test="searchParams.isSend != null">
-                and a.is_send = #{searchParams.isSend}
-            </if>
-            <if test="searchParams.offerId != null">
-                and a.offer_id = #{searchParams.offerId}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByPersonId" resultMap="ApplicationPrimaryMap">
-        select * from base_application_primary
-        where person_id=#{0} and del_flag=0
-        order by create_time asc
-    </select>
-    <select id="findByStudentId" resultMap="ApplicationPrimaryMap">
-        select * from base_application_primary
-        where student_id=#{0} and del_flag=0
-        order by create_time asc
-    </select>
-    <select id="findByStudentNameAndIdCard" resultMap="ApplicationPrimaryMap">
-        SELECT * FROM base_application_primary t1
-        LEFT JOIN base_student_info t2 ON t1.student_id = t2.id_
-        WHERE
-        t1.del_flag = 0
-        AND t2.name_ LIKE #{studentName}
-        AND t2.id_card = #{idCard}
-        AND t1.school_id = #{schoolId}
-    </select>
-</mapper>

common/src/main/resources/mapper/base/Apportion.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.ApportionDAO">
-	<resultMap id="ApportionMap" type="com.jpsoft.supervision.modules.base.entity.Apportion">
-		<id property="id" column="id_" />
-			<result property="schoolId" column="school_id" />
-			<result property="type" column="type_" />
-			<result property="delFlag" column="del_flag" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.Apportion">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_apportion
-	    (id_,school_id,type_,del_flag,create_by,create_time,update_by,update_time)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{schoolId,jdbcType=VARCHAR}
-,#{type,jdbcType=VARCHAR}
-,#{delFlag,jdbcType= NUMERIC }
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_apportion where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.Apportion">
-		update base_apportion
-		<set>
-				<if test="schoolId!=null">
-		school_id=#{schoolId,jdbcType=VARCHAR},
-		</if>
-				<if test="type!=null">
-		type_=#{type,jdbcType=VARCHAR},
-		</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="ApportionMap">
-		select 
-id_,school_id,type_,del_flag,create_by,create_time,update_by,update_time		from base_apportion where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_apportion where id_=#{0}
-	</select>
-	<select id="list" resultMap="ApportionMap">
-		select * from base_apportion
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="ApportionMap">
-		<![CDATA[
-			select * from base_apportion
-		]]>
-		<where>
-			<if test="searchParams.schoolId != null">
-				and school_id = #{searchParams.schoolId}
-			</if>
-			<if test="searchParams.type != null">
-				and type_ = #{searchParams.type}
-			</if>
-			<if test="searchParams.startDate != null">
-				<![CDATA[
-				and create_time >= #{searchParams.startDate}
-				]]>
-			</if>
-			<if test="searchParams.endDate != null">
-				<![CDATA[
-				and create_time < #{searchParams.endDate}
-				]]>
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-</mapper>

common/src/main/resources/mapper/base/ApportionDetail.xml

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.ApportionDetailDAO">
-	<resultMap id="ApportionDetailMap" type="com.jpsoft.supervision.modules.base.entity.ApportionDetail">
-		<id property="id" column="id_" />
-			<result property="apportionId" column="apportion_id" />
-			<result property="applicationId" column="application_id" />
-			<result property="studentId" column="student_id" />
-			<result property="personId" column="person_id" />
-			<result property="schoolId" column="school_id" />
-			<result property="winner" column="winner_" />
-			<result property="delFlag" column="del_flag" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="studentName" column="student_name" />
-			<result property="studentCard" column="student_card" />
-			<result property="schoolName" column="school_name" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.ApportionDetail">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_apportion_detail
-	    (id_,apportion_id,application_id,student_id,person_id,school_id,winner_,del_flag,create_by,create_time,update_by,update_time)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{apportionId,jdbcType=VARCHAR}
-,#{applicationId,jdbcType=VARCHAR}
-,#{studentId,jdbcType=VARCHAR}
-,#{personId,jdbcType=VARCHAR}
-,#{schoolId,jdbcType=VARCHAR}
-,#{winner,jdbcType= NUMERIC }
-,#{delFlag,jdbcType= NUMERIC }
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_apportion_detail where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.ApportionDetail">
-		update base_apportion_detail
-		<set>
-				<if test="apportionId!=null">
-		apportion_id=#{apportionId,jdbcType=VARCHAR},
-		</if>
-				<if test="applicationId!=null">
-		application_id=#{applicationId,jdbcType=VARCHAR},
-		</if>
-				<if test="studentId!=null">
-		student_id=#{studentId,jdbcType=VARCHAR},
-		</if>
-				<if test="personId!=null">
-		person_id=#{personId,jdbcType=VARCHAR},
-		</if>
-				<if test="schoolId!=null">
-		school_id=#{schoolId,jdbcType=VARCHAR},
-		</if>
-			<if test="winner!=null">
-				winner_=#{winner,jdbcType= NUMERIC },
-			</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="ApportionDetailMap">
-		select * from base_apportion_detail where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_apportion_detail where id_=#{0}
-	</select>
-	<select id="list" resultMap="ApportionDetailMap">
-		select * from base_apportion_detail
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="ApportionDetailMap">
-		<![CDATA[
-				SELECT
-					t1.*,
-					t2.name_ AS student_name,
-					t3.name_ AS school_name,
-					t2.id_card as student_card
-				FROM
-				base_apportion_detail t1
-				LEFT JOIN base_student_info t2 ON t1.student_id = t2.id_
-				LEFT JOIN base_school_info t3 ON t1.school_id = t3.id_
-		]]>
-		<where>
-			<if test="searchParams.apportionId != null">
-				and t1.apportion_id = #{searchParams.apportionId}
-			</if>
-			<if test="searchParams.winner != null">
-				and t1.winner_ = #{searchParams.winner}
-			</if>
-			<if test="searchParams.delFlag != null">
-				and t1.del_flag = #{searchParams.delFlag}
-			</if>
-			<if test="searchParams.createBy != null">
-				and t1.create_by = #{searchParams.createBy}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-	<resultMap id="ApportionDetailDTOMap" type="com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO">
-		<id property="id" column="id_" />
-		<result property="studentName" column="studentName" />
-		<result property="studentCardType" column="studentCardType" />
-		<result property="studentIdCard" column="studentIdCard" />
-		<result property="typeName" column="typeName" />
-		<result property="schoolName" column="schoolName" />
-		<result property="statusName" column="statusName" />
-		<result property="offerName" column="offerName" />
-		<result property="winner" column="winner_" />
-	</resultMap>
-	<select id="pageSearchDTO" parameterType="hashmap" resultMap="ApportionDetailDTOMap">
-		<![CDATA[
-			SELECT a.id_,b.name_ AS studentName,g.name_ AS studentCardType,b.id_card AS studentIdCard,d.name_ AS typeName,e.name_ AS schoolName,h.name_ AS statusName,f.name_ AS offerName,a.winner_ FROM base_apportion_detail a
-			LEFT JOIN base_student_info b ON a.student_id = b.id_
-			LEFT JOIN base_application_primary c ON a.application_id = c.id_
-			LEFT JOIN sys_data_dictionary d ON c.category_id = d.id_
-			LEFT JOIN base_school_info e ON a.school_id = e.id_
-			LEFT JOIN base_school_info f ON c.offer_id = f.id_
-			LEFT JOIN sys_data_dictionary g ON (b.card_type = g.value_ AND g.parent_id = '1f0a58b9-5338-47ef-9233-a4539cc00010')
-			LEFT JOIN sys_data_dictionary h ON (c.status_ = h.value_ AND h.parent_id = '13e5b15f-8d10-44af-99f4-f05c9afd64eb')
-		]]>
-		<where>
-			<if test="searchParams.apportionId != null">
-				and a.apportion_id = #{searchParams.apportionId}
-			</if>
-			<if test="searchParams.winner != null">
-				and a.winner_ = #{searchParams.winner}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-			${sort.name} ${sort.order}
-		</foreach>
-	</select>
-	<select id="findByStudentId" resultMap="ApportionDetailMap" parameterType="string">
-		select * from base_apportion_detail where del_flag = 0
-		and student_id = #{studentId}
-		order by create_time desc
-	</select>
-</mapper>

common/src/main/resources/mapper/base/ApprovalInfo.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.ApprovalInfoDAO">
-    <resultMap id="ApprovalInfoMap" type="com.jpsoft.supervision.modules.base.entity.ApprovalInfo">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="applicationId" column="application_id"/>
-        <result property="operation" column="operation_"/>
-        <result property="remark" column="remark_"/>
-        <result property="fileUrl" column="file_url"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.ApprovalInfo">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_approval_info
-	    (id_,create_by,create_time,update_by,update_time,del_flag,application_id,operation_,remark_,file_url)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{applicationId,jdbcType= VARCHAR }
-            ,#{operation,jdbcType=VARCHAR}
-            ,#{remark,jdbcType=VARCHAR}
-            ,#{fileUrl,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_approval_info where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.ApprovalInfo">
-        update base_approval_info
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="applicationId!=null">
-                application_id=#{applicationId,jdbcType= VARCHAR },
-            </if>
-            <if test="operation!=null">
-                operation_=#{operation,jdbcType=VARCHAR},
-            </if>
-            <if test="remark!=null">
-                remark_=#{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="fileUrl!=null">
-                file_url=#{fileUrl,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="ApprovalInfoMap">
-        select * from base_approval_info where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_approval_info where id_=#{0}
-    </select>
-    <select id="list" resultMap="ApprovalInfoMap">
-        select * from base_approval_info
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="ApprovalInfoMap">
-        <![CDATA[
-			select * from base_approval_info
-		]]>
-        <where>
-            <if test="searchParams.delFlag != null">
-                and del_flag = #{searchParams.delFlag}
-            </if>
-            <if test="searchParams.id != null">
-                and ID_ like #{searchParams.id}
-            </if>
-            <if test="searchParams.applicationId != null">
-                and application_id = #{searchParams.applicationId}
-            </if>
-            <if test="searchParams.operation != null">
-                and operation_ like #{searchParams.operation}
-            </if>
-            <if test="searchParams.operationList != null">
-                <foreach item="operation" collection="searchParams.operationList" open="and (" close=")" separator="or">
-                    operation_ like #{operation}
-                </foreach>
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByApplicationId" parameterType="string" resultMap="ApprovalInfoMap">
-        <![CDATA[
-			select * from base_approval_info
-			where application_id=#{0} and del_flag=0
-			order by create_time asc
-		]]>
-    </select>
-    <select id="findByApplicationIdAndOperation" parameterType="string" resultMap="ApprovalInfoMap">
-        <![CDATA[
-			select * from base_approval_info
-			where application_id=#{applicationId}
-			and remark_ like #{operation}
-			and del_flag=0
-			order by create_time desc
-		]]>
-    </select>
-</mapper>

common/src/main/resources/mapper/base/DistrictInfo.xml

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.DistrictInfoDAO">
-    <resultMap id="DistrictInfoMap" type="com.jpsoft.supervision.modules.base.entity.DistrictInfo">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="streetId" column="street_id"/>
-        <result property="name" column="name_"/>
-        <result property="schoolId" column="school_id"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="longitude" column="longitude_"/>
-        <result property="latitude" column="latitude_"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.DistrictInfo">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_district_info
-	    (id_,create_by,create_time,update_by,update_time,del_flag,street_id,name_,school_id,longitude_,latitude_)
-		values
-		(
-			#{id,jdbcType=VARCHAR}
-			,#{createBy,jdbcType=VARCHAR}
-			,#{createTime,jdbcType= TIMESTAMP }
-			,#{updateBy,jdbcType=VARCHAR}
-			,#{updateTime,jdbcType= TIMESTAMP }
-			,#{delFlag,jdbcType= NUMERIC }
-			,#{streetId,jdbcType=VARCHAR}
-			,#{name,jdbcType=VARCHAR}
-			,#{schoolId,jdbcType=VARCHAR}
-			,#{longitude,jdbcType=VARCHAR}
-			,#{latitude,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_district_info where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.DistrictInfo">
-        update base_district_info
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="streetId!=null">
-                street_id=#{streetId,jdbcType=VARCHAR},
-            </if>
-            <if test="name!=null">
-                name_=#{name,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolId!=null">
-                school_id=#{schoolId,jdbcType=VARCHAR},
-            </if>
-            <if test="longitude!=null">
-                longitude_=#{longitude,jdbcType=VARCHAR},
-            </if>
-            <if test="latitude!=null">
-                latitude_=#{latitude,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="DistrictInfoMap">
-        select
-        id_,create_by,create_time,update_by,update_time,del_flag,street_id,name_,school_id,longitude_,latitude_ from
-        base_district_info where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_district_info where id_=#{0}
-    </select>
-    <select id="list" resultMap="DistrictInfoMap">
-        select * from base_district_info
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="DistrictInfoMap">
-        <![CDATA[
-			select
-			a.*,b.name_ as school_name
-			from base_district_info a
-			left join base_school_info b on a.school_id = b.id_ and b.del_flag = 0
-		]]>
-        <where>
-            a.del_flag = 0
-            <if test="searchParams.id != null">
-                and a.ID_ like #{searchParams.id}
-            </if>
-            <if test="searchParams.name != null">
-                and a.name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.streetId != null">
-                and a.street_id = #{searchParams.streetId}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByStreetId" resultMap="DistrictInfoMap">
-        <![CDATA[
-			select a.*,b.name_ as school_name
-			from base_district_info a left join base_school_info b on a.school_id = b.id_
-			where a.del_flag=0 and b.del_flag=0
-			and a.street_id = #{streetId}
-			and FIND_IN_SET('1',b.enrollment_type)
-			order by a.create_time asc
-		]]>
-    </select>
-    <select id="findActiveByStreetId" resultMap="DistrictInfoMap">
-        <![CDATA[
-			select a.*,b.name_ as school_name from base_district_info a
-            left join
-            (
-                select * from base_school_info
-                where id_ in (
-                    select school_id from base_enroll_control c
-                    where c.school_type=#{enrollmentType}
-                    and c.student_type = #{type}
-                    and now()<c.end_time
-                    and c.del_flag=0
-                )
-                and del_flag=0
-            ) as b
-            on a.school_id = b.id_
-            where a.del_flag=0
-            and a.street_id = #{streetId}
-            order by a.create_time asc
-		]]>
-    </select>
-</mapper>

common/src/main/resources/mapper/base/EnrollControl.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.EnrollControlDAO">
-    <resultMap id="EnrollControlMap" type="com.jpsoft.supervision.modules.base.entity.EnrollControl">
-        <id property="id" column="id_" />
-        <result property="schoolId" column="school_id"/>
-        <result property="schoolType" column="school_type" />
-        <result property="studentType" column="student_type" />
-        <result property="startTime" column="start_time" />
-        <result property="endTime" column="end_time" />
-        <result property="createBy" column="create_by" />
-        <result property="createTime" column="create_time" />
-        <result property="updateBy" column="update_by" />
-        <result property="updateTime" column="update_time" />
-        <result property="delFlag" column="del_flag" />
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.EnrollControl">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_enroll_control
-	    (id_,school_id,school_type,student_type,start_time,end_time,
-	    create_by,create_time,update_by,update_time,del_flag)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{schoolId,jdbcType=VARCHAR}
-,#{schoolType,jdbcType=VARCHAR}
-,#{studentType,jdbcType=VARCHAR}
-,#{startTime,jdbcType=TIMESTAMP}
-,#{endTime,jdbcType=TIMESTAMP}
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-,#{delFlag,jdbcType= NUMERIC }
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_enroll_control where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.EnrollControl">
-        update base_enroll_control
-        <set>
-            <if test="schoolId!=null">
-                school_id=#{schoolId,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolType!=null">
-                school_type=#{schoolType,jdbcType=VARCHAR},
-            </if>
-            <if test="studentType!=null">
-                student_type=#{studentType,jdbcType=VARCHAR},
-            </if>
-            <if test="startTime!=null">
-                start_time=#{startTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="endTime!=null">
-                end_time=#{endTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="EnrollControlMap">
-        select * from base_enroll_control where id_=#{0} and del_flag = 0
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_enroll_control where id_=#{0}
-    </select>
-    <select id="list" resultMap="EnrollControlMap">
-		select * from base_enroll_control
-	</select>
-    <select id="search" parameterType="hashmap" resultMap="EnrollControlMap">
-        <![CDATA[
-			select * from base_enroll_control
-		]]>
-
-        <where>
-            del_flag = 0
-            <if test="searchParams.id != null">
-                and ID_ = #{searchParams.id}
-            </if>
-            <if test="searchParams.schoolId != null">
-                and school_id = #{searchParams.schoolId}
-            </if>
-            <if test="searchParams.schoolType != null">
-                and school_type = #{searchParams.schoolType}
-            </if>
-            <if test="searchParams.studentType != null">
-                and student_type = #{searchParams.studentType}
-            </if>
-            <if test="searchParams.endTime != null">
-                and end_time &lt; #{searchParams.endTime}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList"  open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-
-    <select id="findBySchoolTypeAndStudentType" resultMap="EnrollControlMap">
-        <![CDATA[
-        select * from base_enroll_control
-        where del_flag = 0
-        and school_type = #{schoolType}
-        and student_type = #{studentType}
-        ]]>
-    </select>
-</mapper>

common/src/main/resources/mapper/base/NewsInfo.xml

@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.NewsInfoDAO">
-	<resultMap id="NewsInfoMap" type="com.jpsoft.supervision.modules.base.entity.NewsInfo">
-		<id property="id" column="id_" />
-			<result property="type" column="type_" />
-            <result property="title" column="title_" />
-			<result property="subtitle" column="subtitle_" />
-			<result property="logo" column="logo_" />
-			<result property="remark" column="remark_" />
-			<result property="link" column="link_" />
-			<result property="content" column="content_" />
-			<result property="status" column="status_" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			<result property="sortNo" column="sort_no" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.NewsInfo">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_news_info
-	    (id_,type_,title_,logo_,remark_,link_,content_,status_,
-	    create_by,create_time,update_by,update_time,del_flag,subtitle_,
-	    sort_no)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{type,jdbcType=VARCHAR}
-,#{title,jdbcType=VARCHAR}
-,#{logo,jdbcType=VARCHAR}
-,#{remark,jdbcType=VARCHAR}
-,#{link,jdbcType=VARCHAR}
-,#{content,jdbcType= VARCHAR }
-,#{status,jdbcType=VARCHAR}
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-,#{delFlag,jdbcType= NUMERIC }
-,#{subtitle,jdbcType=VARCHAR}
-,#{sortNo,jdbcType= NUMERIC }
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_news_info where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.NewsInfo">
-		update base_news_info
-		<set>
-				<if test="type!=null">
-		type_=#{type,jdbcType=VARCHAR},
-		</if>
-				<if test="title!=null">
-                    title_=#{title,jdbcType=VARCHAR},
-		</if>
-				<if test="logo!=null">
-		logo_=#{logo,jdbcType=VARCHAR},
-		</if>
-				<if test="remark!=null">
-		remark_=#{remark,jdbcType=VARCHAR},
-		</if>
-				<if test="link!=null">
-		link_=#{link,jdbcType=VARCHAR},
-		</if>
-				<if test="content!=null">
-		content_=#{content,jdbcType= VARCHAR },
-		</if>
-				<if test="status!=null">
-		status_=#{status,jdbcType=VARCHAR},
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-            <if test="subtitle!=null">
-                subtitle_=#{subtitle,jdbcType= NUMERIC },
-            </if>
-			<if test="sortNo!=null">
-				sort_no=#{sortNo,jdbcType= NUMERIC },
-			</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="NewsInfoMap">
-		select * from base_news_info where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_news_info where id_=#{0}
-	</select>
-	<select id="list" resultMap="NewsInfoMap">
-		select * from base_news_info
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="NewsInfoMap">
-		<![CDATA[
-			select * from base_news_info
-		]]>
-
-		<where>
-			del_flag = 0
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
-			</if>
-			<if test="searchParams.title != null">
-				and title_ like #{searchParams.title}
-			</if>
-			<if test="searchParams.type != null">
-				and type_ = #{searchParams.type}
-			</if>
-			<if test="searchParams.status != null">
-				and status_ like #{searchParams.status}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-
-	<select id="findByTypeAndStatus" resultMap="NewsInfoMap">
-		<![CDATA[
-		select * from base_news_info where type_ = #{type}
-		and del_flag = 0
-		and status_ = 1
-		]]>
-
-	</select>
-</mapper>

common/src/main/resources/mapper/base/OfferInfo.xml

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.OfferInfoDAO">
-	<resultMap id="OfferInfoMap" type="com.jpsoft.supervision.modules.base.entity.OfferInfo">
-		<id property="id" column="id_" />
-			<result property="studentId" column="student_id" />
-			<result property="applicationId" column="application_id" />
-			<result property="enrollmentType" column="enrollment_type" />
-			<result property="schoolId" column="school_id" />
-			<result property="serialNum" column="serial_num" />
-			<result property="code" column="code_" />
-			<result property="reportTime" column="report_time" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.OfferInfo">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_offer_info
-	    (id_,student_id,application_id,enrollment_type,school_id,serial_num,code_,report_time,create_by,create_time,update_by,update_time,del_flag)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{studentId,jdbcType=VARCHAR}
-,#{applicationId,jdbcType=VARCHAR}
-,#{enrollmentType,jdbcType=VARCHAR}
-,#{schoolId,jdbcType=VARCHAR}
-,#{serialNum,jdbcType= NUMERIC }
-,#{code,jdbcType=VARCHAR}
-,#{reportTime,jdbcType= TIMESTAMP }
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-,#{delFlag,jdbcType= NUMERIC }
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_offer_info where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.OfferInfo">
-		update base_offer_info
-		<set>
-				<if test="studentId!=null">
-		student_id=#{studentId,jdbcType=VARCHAR},
-		</if>
-				<if test="applicationId!=null">
-		application_id=#{applicationId,jdbcType=VARCHAR},
-		</if>
-				<if test="enrollmentType!=null">
-		enrollment_type=#{enrollmentType,jdbcType=VARCHAR},
-		</if>
-				<if test="schoolId!=null">
-		school_id=#{schoolId,jdbcType=VARCHAR},
-		</if>
-				<if test="serialNum!=null">
-		serial_num=#{serialNum,jdbcType= NUMERIC },
-		</if>
-				<if test="code!=null">
-		code_=#{code,jdbcType=VARCHAR},
-		</if>
-				<if test="reportTime!=null">
-		report_time=#{reportTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="OfferInfoMap">
-		select * from base_offer_info where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_offer_info where id_=#{0}
-	</select>
-	<select id="list" resultMap="OfferInfoMap">
-		select * from base_offer_info
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="OfferInfoMap">
-		<![CDATA[
-			select * from base_offer_info
-		]]>
-		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-
-	<select id="findMaxSerialNum" parameterType="string" resultType="int">
-		SELECT
-		IF ( max( serial_num ) IS NULL, 0, max( serial_num ) )
-		FROM
-		base_offer_info
-		WHERE
-		del_flag = 0
-		AND school_id = #{schoolId}
-		AND enrollment_type = #{enrollmentType}
-	</select>
-</mapper>

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.PersonInfoDAO">
-    <resultMap id="PersonInfoMap" type="com.jpsoft.supervision.modules.base.entity.PersonInfo">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="name" column="name_"/>
-        <result property="idCard" column="id_card"/>
-        <result property="phone" column="phone_"/>
-        <result property="openId" column="open_id"/>
-        <result property="houseType" column="house_type"/>
-        <result property="nowAddress" column="now_address"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.PersonInfo">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_person_info
-	    (id_,create_by,create_time,update_by,update_time,del_flag,name_,id_card,phone_,open_id,house_type,now_address)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{name,jdbcType=VARCHAR}
-            ,#{idCard,jdbcType=VARCHAR}
-            ,#{phone,jdbcType=VARCHAR}
-            ,#{openId,jdbcType=VARCHAR}
-            ,#{houseType,jdbcType=VARCHAR}
-            ,#{nowAddress,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_person_info where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.PersonInfo">
-        update base_person_info
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="name!=null">
-                name_=#{name,jdbcType=VARCHAR},
-            </if>
-            <if test="idCard!=null">
-                id_card=#{idCard,jdbcType=VARCHAR},
-            </if>
-            <if test="phone!=null">
-                phone_=#{phone,jdbcType=VARCHAR},
-            </if>
-            <if test="openId!=null">
-                open_id=#{openId,jdbcType=VARCHAR},
-            </if>
-            <if test="houseType!=null">
-                house_type=#{houseType,jdbcType=VARCHAR},
-            </if>
-            <if test="nowAddress!=null">
-                now_address=#{nowAddress,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="PersonInfoMap">
-        select
-        id_,create_by,create_time,update_by,update_time,del_flag,name_,id_card,phone_,open_id,house_type,now_address
-        from base_person_info where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_person_info where id_=#{0}
-    </select>
-    <select id="list" resultMap="PersonInfoMap">
-        select * from base_person_info
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="PersonInfoMap">
-        <![CDATA[
-			select * from base_person_info
-		]]>
-        <where>
-            del_flag = 0
-            <if test="searchParams.id != null">
-                and ID_ like #{searchParams.id}
-            </if>
-            <if test="searchParams.name != null">
-                and name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.idCard != null">
-                and id_card like #{searchParams.idCard}
-            </if>
-            <if test="searchParams.phone != null">
-                and phone_ like #{searchParams.phone}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByPhone" resultMap="PersonInfoMap">
-        select * from base_person_info where phone_=#{0} and del_flag=0 limit 1
-    </select>
-    <select id="findByOpenId" resultMap="PersonInfoMap">
-        select * from base_person_info where open_id=#{0} and del_flag=0 limit 1
-    </select>
-    <select id="findByIdCard" resultMap="PersonInfoMap">
-        select * from base_person_info where id_card=#{0} and del_flag=0 limit 1
-    </select>
-</mapper>

common/src/main/resources/mapper/base/PersonStudent.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.PersonStudentDAO">
-    <resultMap id="PersonStudentMap" type="com.jpsoft.supervision.modules.base.entity.PersonStudent">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="personId" column="person_id"/>
-        <result property="studentId" column="student_id"/>
-        <result property="relationship" column="relationship_"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.PersonStudent">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_person_student
-	    (id_,create_by,create_time,update_by,update_time,del_flag,person_id,student_id,relationship_)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{personId,jdbcType=VARCHAR}
-            ,#{studentId,jdbcType=VARCHAR}
-            ,#{relationship,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_person_student where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.PersonStudent">
-        update base_person_student
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="personId!=null">
-                person_id=#{personId,jdbcType=VARCHAR},
-            </if>
-            <if test="studentId!=null">
-                student_id=#{studentId,jdbcType=VARCHAR},
-            </if>
-            <if test="relationship!=null">
-                relationship_=#{relationship,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="PersonStudentMap">
-        select
-        id_,create_by,create_time,update_by,update_time,del_flag,person_id,student_id,relationship_ from
-        base_person_student where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_person_student where id_=#{0}
-    </select>
-    <select id="list" resultMap="PersonStudentMap">
-        select * from base_person_student
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="PersonStudentMap">
-        <![CDATA[
-			select * from base_person_student
-		]]>
-        <where>
-            <if test="searchParams.id != null">
-                and ID_ like #{searchParams.id}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByPersonIdAndStudentId" resultMap="PersonStudentMap">
-        select * from base_person_student
-        where person_id=#{personId}
-        and student_id=#{studentId}
-        and del_flag=0
-        limit 1
-    </select>
-</mapper>

common/src/main/resources/mapper/base/SchoolInfo.xml

@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.SchoolInfoDAO">
-    <resultMap id="SchoolInfoMap" type="com.jpsoft.supervision.modules.base.entity.SchoolInfo">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="name" column="name_"/>
-        <result property="logo" column="logo_"/>
-        <result property="enrollmentType" column="enrollment_type"/>
-        <result property="address" column="address_"/>
-        <result property="phone" column="phone_"/>
-        <result property="lectorIntroduction" column="lector_introduction"/>
-        <result property="longitude" column="longitude_"/>
-        <result property="latitude" column="latitude_"/>
-        <result property="code" column="code_"/>
-        <result property="introduction" column="introduction_"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="parentName" column="parent_name"/>
-        <result property="schoolCode" column="school_code"/>
-        <result property="type" column="type_"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.SchoolInfo">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_school_info
-	    (id_,create_by,create_time,update_by,update_time,del_flag,name_,logo_,enrollment_type,address_,phone_,
-	    lector_introduction,longitude_,latitude_,code_,introduction_,parent_id,school_code,type_)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{name,jdbcType=VARCHAR}
-            ,#{logo,jdbcType=VARCHAR}
-            ,#{enrollmentType,jdbcType=VARCHAR}
-            ,#{address,jdbcType=VARCHAR}
-            ,#{phone,jdbcType=VARCHAR}
-            ,#{lectorIntroduction,jdbcType= VARCHAR }
-            ,#{longitude,jdbcType=VARCHAR}
-            ,#{latitude,jdbcType=VARCHAR}
-            ,#{code,jdbcType=VARCHAR}
-            ,#{introduction,jdbcType=VARCHAR}
-            ,#{parentId,jdbcType=VARCHAR}
-            ,#{schoolCode,jdbcType=VARCHAR}
-            ,#{type,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_school_info where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.SchoolInfo">
-        update base_school_info
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="name!=null">
-                name_=#{name,jdbcType=VARCHAR},
-            </if>
-            <if test="logo!=null">
-                logo_=#{logo,jdbcType=VARCHAR},
-            </if>
-            <if test="enrollmentType!=null">
-                enrollment_type=#{enrollmentType,jdbcType=VARCHAR},
-            </if>
-            <if test="address!=null">
-                address_=#{address,jdbcType=VARCHAR},
-            </if>
-            <if test="phone!=null">
-                phone_=#{phone,jdbcType=VARCHAR},
-            </if>
-            <if test="lectorIntroduction!=null">
-                lector_introduction=#{lectorIntroduction,jdbcType= NUMERIC },
-            </if>
-            <if test="longitude!=null">
-                longitude_=#{longitude,jdbcType=VARCHAR},
-            </if>
-            <if test="latitude!=null">
-                latitude_=#{latitude,jdbcType=VARCHAR},
-            </if>
-            <if test="code!=null">
-                code_=#{code,jdbcType=VARCHAR},
-            </if>
-            <if test="introduction!=null">
-                introduction_=#{introduction,jdbcType=VARCHAR},
-            </if>
-            <if test="parentId!=null">
-                parent_id=#{parentId,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolCode!=null">
-                school_code=#{schoolCode,jdbcType=VARCHAR},
-            </if>
-            <if test="type!=null">
-                type_=#{type,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <update id="updateParentIdNull" parameterType="com.jpsoft.supervision.modules.base.entity.SchoolInfo">
-        update base_school_info
-        <set>
-            <if test="parentId==null">
-                parent_id=#{parentId,jdbcType=VARCHAR},
-            </if>
-            <if test="schoolCode==null">
-                school_code=#{schoolCode,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="SchoolInfoMap">
-        select * from base_school_info where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_school_info where id_=#{0}
-    </select>
-    <select id="list" resultMap="SchoolInfoMap">
-        select * from base_school_info where del_flag = 0
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="SchoolInfoMap">
-        <![CDATA[
-			select a.*,b.name_ as parent_name
-			 from base_school_info a
-			left join base_school_info b on a.parent_id = b.id_
-		]]>
-        <where>
-            a.del_flag = 0
-            <if test="searchParams.id != null">
-                and a.ID_ like #{searchParams.id}
-            </if>
-            <if test="searchParams.name != null">
-                and a.name_ like #{searchParams.name}
-            </if>
-            <if test="searchParams.enrollmentType != null">
-                and a.enrollment_type like #{searchParams.enrollmentType}
-            </if>
-            <if test="searchParams.code != null">
-                and a.code_ like #{searchParams.code}
-            </if>
-            <if test="searchParams.type != null">
-                and a.type_ like #{searchParams.type}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByEnrollmentType" resultMap="SchoolInfoMap">
-        select * from base_school_info a
-        where find_in_set(#{enrollmentType},a.enrollment_type)
-        and a.del_flag=0
-        and a.type_ = '1'
-        order by a.create_time asc
-    </select>
-    <select id="countByParentId" resultType="long">
-        select count(*) from base_school_info
-        <where>
-            del_flag=0
-            <if test="parentId!=null">
-                and parent_id=#{parentId,jdbcType=VARCHAR}
-            </if>
-            <if test="parentId==null">
-                and (parent_id is null or parent_id='')
-            </if>
-        </where>
-    </select>
-    <select id="findByParentId" resultMap="SchoolInfoMap">
-        select a.*,b.name_ as parent_name
-        from base_school_info a
-        left join base_school_info b on a.parent_id = b.id_
-        where a.del_flag=0
-        <if test="parentId!=null">
-            and a.parent_id=#{parentId,jdbcType=VARCHAR}
-        </if>
-        <if test="parentId==null">
-            and (a.parent_id is null or a.parent_id='')
-        </if>
-        order by a.school_code asc,a.name_ asc
-    </select>
-    <select id="findActiveSchoolByEnrollmentType" resultMap="SchoolInfoMap">
-        <![CDATA[
-        select * from base_school_info a
-        where find_in_set(#{enrollmentType},a.enrollment_type)
-        and a.del_flag=0
-        and a.id_ in(
-            select b.school_id from base_enroll_control b
-            where b.school_type=#{enrollmentType}
-            and b.student_type = #{type}
-            and b.del_flag=0
-            and now()<b.end_time
-        )
-        order by a.create_time asc
-        ]]>
-    </select>
-</mapper>

common/src/main/resources/mapper/base/SchoolRelation.xml

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.SchoolRelationDAO">
-    <resultMap id="SchoolRelationMap" type="com.jpsoft.supervision.modules.base.entity.SchoolRelation">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="primaryId" column="primary_id"/>
-        <result property="middleId" column="middle_id"/>
-        <result property="remark" column="remark_"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.SchoolRelation">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_school_relation
-	    (id_,create_by,create_time,update_by,update_time,del_flag,name_,logo_,enrollment_type,address_,phone_,
-	    lector_introduction,longitude_,latitude_,code_,introduction_)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{primaryId,jdbcType=VARCHAR}
-            ,#{middleId,jdbcType=VARCHAR}
-            ,#{remark,jdbcType=VARCHAR}
-
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_school_relation where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.SchoolRelation">
-        update base_school_relation
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="primaryId!=null">
-                primary_id=#{primaryId,jdbcType=VARCHAR},
-            </if>
-            <if test="middleId!=null">
-                middle_id=#{middleId,jdbcType=VARCHAR},
-            </if>
-            <if test="remark!=null">
-                remark_=#{remark,jdbcType=VARCHAR},
-            </if>
-
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="SchoolRelationMap">
-        select * from base_school_relation where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_school_relation where id_=#{0}
-    </select>
-    <select id="list" resultMap="SchoolRelationMap">
-        select * from base_school_relation where del_flag = 0
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="SchoolRelationMap">
-        <![CDATA[
-			select * from base_school_relation a
-		]]>
-        <where>
-            a.del_flag = 0
-            <if test="searchParams.id != null">
-                and a.ID_ like #{searchParams.id}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-
-    <select id="findByPrimaryId" resultMap="SchoolRelationMap">
-        <![CDATA[
-
-        select * from base_school_relation
-        where del_flag = 0
-        and primary_id = #{primaryId}
-        ]]>
-    </select>
-
-</mapper>

common/src/main/resources/mapper/base/StudentFiles.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.StudentFilesDAO">
-    <resultMap id="StudentFilesMap" type="com.jpsoft.supervision.modules.base.entity.StudentFiles">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="studentId" column="student_id"/>
-        <result property="fileType" column="file_type"/>
-        <result property="fileUrl" column="file_url"/>
-        <result property="applicationId" column="application_id"/>
-        <result property="sortNo" column="sort_no"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.StudentFiles">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_student_files
-	    (id_,create_by,create_time,update_by,update_time,del_flag,student_id,file_type,file_url,application_id,sort_no)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{studentId,jdbcType=VARCHAR}
-            ,#{fileType,jdbcType=VARCHAR}
-            ,#{fileUrl,jdbcType=VARCHAR}
-            ,#{applicationId,jdbcType= VARCHAR }
-            ,#{sortNo,jdbcType= NUMERIC }
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_student_files where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <delete id="deleteByApplicationIdAndFileType">
-        update base_student_files set del_flag=1
-        where application_id = #{applicationId} and file_type = #{fileType}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.StudentFiles">
-        update base_student_files
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="studentId!=null">
-                student_id=#{studentId,jdbcType=VARCHAR},
-            </if>
-            <if test="fileType!=null">
-                file_type=#{fileType,jdbcType=VARCHAR},
-            </if>
-            <if test="fileUrl!=null">
-                file_url=#{fileUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="applicationId!=null">
-                application_id=#{applicationId,jdbcType= VARCHAR },
-            </if>
-            <if test="sortNo!=null">
-                sort_no=#{sortNo,jdbcType= NUMERIC },
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="StudentFilesMap">
-        select * from
-        base_student_files where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_student_files where id_=#{0}
-    </select>
-    <select id="list" resultMap="StudentFilesMap">
-        select * from base_student_files
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="StudentFilesMap">
-        <![CDATA[
-			select * from base_student_files
-		]]>
-        <where>
-            <if test="searchParams.studentId != null">
-                and student_id like #{searchParams.studentId}
-            </if>
-            <if test="searchParams.fileType != null">
-                and file_type like #{searchParams.fileType}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-	<select id="findByApplicationIdAndFileType" parameterType="hashmap" resultMap="StudentFilesMap">
-		<![CDATA[
-			select * from base_student_files
-            where del_flag=0
-            and application_id=#{applicationId}
-            and file_type = #{fileType}
-            order by create_time asc
-		]]>
-	</select>
-    <select id="findUrlByApplicationIdAndFileType" parameterType="hashmap" resultType="String">
-        <![CDATA[
-			select file_url from base_student_files
-            where del_flag=0
-            and application_id=#{applicationId}
-            and file_type = #{fileType}
-            order by create_time asc
-		]]>
-    </select>
-</mapper>

common/src/main/resources/mapper/base/StudentInfo.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.StudentInfoDAO">
-    <resultMap id="StudentInfoMap" type="com.jpsoft.supervision.modules.base.entity.StudentInfo">
-        <id property="id" column="id_"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="name" column="name_"/>
-        <result property="oldName" column="old_name"/>
-        <result property="sex" column="sex_"/>
-        <result property="cardType" column="card_type"/>
-        <result property="idCard" column="id_card"/>
-        <result property="documentUrl" column="document_url"/>
-        <result property="birthday" column="birthday_"/>
-        <result property="registerName" column="register_name"/>
-        <result property="registerTel" column="register_tel"/>
-        <result property="status" column="status_"/>
-        <result property="nation" column="nation_"/>
-        <result property="isPolicy" column="is_policy"/>
-        <result property="type" column="type_"/>
-        <result property="address" column="address_"/>
-    </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.StudentInfo">
-        <!--
-        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-            select sys_guid() from dual
-        </selectKey>
-        -->
-        <![CDATA[
-		insert into base_student_info
-	    (id_,create_by,create_time,update_by,update_time,del_flag,name_,old_name,sex_,card_type,
-	    id_card,document_url,birthday_,register_name,register_tel,status_,nation_,is_policy,type_,address_)
-		values
-		(
-            #{id,jdbcType=VARCHAR}
-            ,#{createBy,jdbcType=VARCHAR}
-            ,#{createTime,jdbcType= TIMESTAMP }
-            ,#{updateBy,jdbcType=VARCHAR}
-            ,#{updateTime,jdbcType= TIMESTAMP }
-            ,#{delFlag,jdbcType= NUMERIC }
-            ,#{name,jdbcType=VARCHAR}
-            ,#{oldName,jdbcType=VARCHAR}
-            ,#{sex,jdbcType= NUMERIC }
-            ,#{cardType,jdbcType=VARCHAR}
-            ,#{idCard,jdbcType=VARCHAR}
-            ,#{documentUrl,jdbcType=VARCHAR}
-            ,#{birthday,jdbcType= TIMESTAMP }
-            ,#{registerName,jdbcType=VARCHAR}
-            ,#{registerTel,jdbcType=VARCHAR}
-            ,#{status,jdbcType=VARCHAR}
-            ,#{nation,jdbcType=VARCHAR}
-            ,#{isPolicy,jdbcType= NUMERIC }
-            ,#{type,jdbcType=VARCHAR}
-            ,#{address,jdbcType=VARCHAR}
-		)
-	]]>
-    </insert>
-    <delete id="delete" parameterType="string">
-        delete from base_student_info where id_=#{id,jdbcType=VARCHAR}
-    </delete>
-    <update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.StudentInfo">
-        update base_student_info
-        <set>
-            <if test="createBy!=null">
-                create_by=#{createBy,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime!=null">
-                create_time=#{createTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="updateBy!=null">
-                update_by=#{updateBy,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime!=null">
-                update_time=#{updateTime,jdbcType= TIMESTAMP },
-            </if>
-            <if test="delFlag!=null">
-                del_flag=#{delFlag,jdbcType= NUMERIC },
-            </if>
-            <if test="name!=null">
-                name_=#{name,jdbcType=VARCHAR},
-            </if>
-            <if test="oldName!=null">
-                old_name=#{oldName,jdbcType=VARCHAR},
-            </if>
-            <if test="sex!=null">
-                sex_=#{sex,jdbcType= NUMERIC },
-            </if>
-            <if test="cardType!=null">
-                card_type=#{cardType,jdbcType=VARCHAR},
-            </if>
-            <if test="documentUrl!=null">
-                document_url=#{documentUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="idCard!=null">
-                id_card=#{idCard,jdbcType=VARCHAR},
-            </if>
-            <if test="birthday!=null">
-                birthday_=#{birthday,jdbcType= TIMESTAMP },
-            </if>
-            <if test="registerName!=null">
-                register_name=#{registerName,jdbcType=VARCHAR},
-            </if>
-            <if test="registerTel!=null">
-                register_tel=#{registerTel,jdbcType=VARCHAR},
-            </if>
-            <if test="status!=null">
-                status_=#{status,jdbcType=VARCHAR},
-            </if>
-            <if test="nation!=null">
-                nation_=#{nation,jdbcType=VARCHAR},
-            </if>
-            <if test="isPolicy!=null">
-                is_policy=#{isPolicy,jdbcType= NUMERIC },
-            </if>
-            <if test="type!=null">
-                type_=#{type,jdbcType=VARCHAR},
-            </if>
-            <if test="address!=null">
-                address_=#{address,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id_=#{id}
-    </update>
-    <select id="get" parameterType="string" resultMap="StudentInfoMap">
-        select * from base_student_info where id_=#{0}
-    </select>
-    <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_student_info where id_=#{0}
-    </select>
-    <select id="list" resultMap="StudentInfoMap">
-        select * from base_student_info
-    </select>
-    <select id="search" parameterType="hashmap" resultMap="StudentInfoMap">
-        <![CDATA[
-			select * from base_student_info
-		]]>
-        <where>
-            <if test="searchParams.id != null">
-                and ID_ like #{searchParams.id}
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
-    <select id="findByIdCard" resultMap="StudentInfoMap">
-        select * from base_student_info where id_card=#{0} and del_flag=0 order by create_time desc limit 1
-    </select>
-</mapper>

web/src/main/java/com/jpsoft/supervision/modules/base/controller/AdjustDetailController.java

@@ -1,245 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
-import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
-import com.jpsoft.supervision.modules.base.service.AdjustDetailService;
-import com.jpsoft.supervision.modules.base.service.ApplicationPrimaryService;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/adjustDetail")
-@Api(description = "adjustDetail")
-public class AdjustDetailController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private AdjustDetailService adjustDetailService;
-    @Autowired
-    private ApplicationPrimaryService applicationPrimaryService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<AdjustDetail> create(){
-        MessageResult<AdjustDetail> msgResult = new MessageResult<>();
-
-        AdjustDetail adjustDetail = new AdjustDetail();
-
-        msgResult.setData(adjustDetail);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<AdjustDetail> edit(@PathVariable("id") String id){
-        MessageResult<AdjustDetail> msgResult = new MessageResult<>();
-
-        try {
-            AdjustDetail adjustDetail = adjustDetailService.get(id);
-
-            if (adjustDetail != null) {
-                msgResult.setResult(true);
-                msgResult.setData(adjustDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<AdjustDetail> update(@RequestBody AdjustDetail adjustDetail,@RequestAttribute String subject){
-        MessageResult<AdjustDetail> msgResult = new MessageResult<>();
-
-        try {
-            adjustDetail.setUpdateBy(subject);
-            adjustDetail.setUpdateTime(new Date());
-            
-            int affectCount = adjustDetailService.update(adjustDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(adjustDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            AdjustDetail adjustDetail = adjustDetailService.get(id);
-            adjustDetail.setDelFlag(true);
-            adjustDetail.setUpdateBy(subject);
-            adjustDetail.setUpdateTime(new Date());
-
-            int affectCount = adjustDetailService.update(adjustDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                AdjustDetail adjustDetail = adjustDetailService.get(id);
-                adjustDetail.setDelFlag(true);
-                adjustDetail.setUpdateBy(subject);
-                adjustDetail.setUpdateTime(new Date());
-
-                affectCount += adjustDetailService.update(adjustDetail);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="调剂列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String schoolId,String idCardOrName,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
-
-        if (StringUtils.isNotEmpty(schoolId)) {
-            searchParams.put("schoolId",schoolId);
-        }
-        if (StringUtils.isNotEmpty(idCardOrName)) {
-            searchParams.put("idCardOrName",idCardOrName);
-        }
-
-        Page<AdjustDetailDTO> page = adjustDetailService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="调剂学校")
-    @PostMapping("add")
-    public MessageResult<AdjustDetail> add(String applicationId,String schoolId,@RequestAttribute String subject){
-        MessageResult<AdjustDetail> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(applicationId);
-            applicationPrimary.setOfferId(schoolId);
-            applicationPrimary.setStatus(String.valueOf(Integer.parseInt(applicationPrimary.getStatus()) + 10));
-            applicationPrimary.setUpdateBy(subject);
-            applicationPrimary.setUpdateTime(new Date());
-            applicationPrimaryService.update(applicationPrimary);
-
-            //写入调剂
-            AdjustDetail adjustDetail = new AdjustDetail();
-            adjustDetail.setId(UUID.randomUUID().toString());
-            adjustDetail.setApplicationId(applicationPrimary.getId());
-            adjustDetail.setStudentId(applicationPrimary.getStudentId());
-            adjustDetail.setPersonId(applicationPrimary.getPersonId());
-            adjustDetail.setSchoolId(schoolId);
-            adjustDetail.setDelFlag(false);
-            adjustDetail.setCreateBy(subject);
-            adjustDetail.setCreateTime(new Date());
-            adjustDetail.setUpdateBy(subject);
-            adjustDetail.setUpdateTime(new Date());
-            int affectCount = adjustDetailService.update(adjustDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(adjustDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/ApplicationMiddleController.java

@@ -1,2026 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.config.OSSConfig;
-import com.jpsoft.supervision.config.WechatConfig;
-import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.supervision.modules.base.dto.AttachmentDTO;
-import com.jpsoft.supervision.modules.base.entity.*;
-import com.jpsoft.supervision.modules.base.service.*;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.OSSUtil;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import com.jpsoft.supervision.modules.common.utils.WechatMessageUtil;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
-import com.jpsoft.supervision.modules.sys.entity.User;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
-import com.jpsoft.supervision.modules.sys.service.UserRoleService;
-import com.jpsoft.supervision.modules.sys.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.web.bind.annotation.*;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.List;
-
-@RestController
-@RequestMapping("/base/applicationMiddle")
-@Api(description = "applicationMiddle")
-public class ApplicationMiddleController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApplicationMiddleService applicationMiddleService;
-    @Autowired
-    private StudentInfoService studentInfoService;
-    @Autowired
-    private PersonInfoService personInfoService;
-    @Autowired
-    private StudentFilesService studentFilesService;
-    @Autowired
-    private DataDictionaryService dataDictionaryService;
-    @Autowired
-    private ApprovalInfoService approvalInfoService;
-    @Autowired
-    private PersonStudentService personStudentService;
-    @Autowired
-    private SchoolInfoService schoolInfoService;
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private UserRoleService userRoleService;
-    @Autowired
-    private OSSConfig ossConfig;
-    @Autowired
-    private WechatConfig wechatConfig;
-    @Autowired
-    private OfferInfoService offerInfoService;
-    @Autowired
-    private ApportionDetailService apportionDetailService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<ApplicationMiddle> create(){
-        MessageResult<ApplicationMiddle> msgResult = new MessageResult<>();
-
-        ApplicationMiddle applicationMiddle = new ApplicationMiddle();
-
-        msgResult.setData(applicationMiddle);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<ApplicationMiddle> add(@RequestBody ApplicationMiddle applicationMiddle,@RequestAttribute String subject){
-        MessageResult<ApplicationMiddle> msgResult = new MessageResult<>();
-
-        try {
-            //applicationMiddle.setId(UUID.randomUUID().toString());
-            applicationMiddle.setDelFlag(false);
-            applicationMiddle.setCreateBy(subject);
-            applicationMiddle.setCreateTime(new Date());
-            
-            int affectCount = applicationMiddleService.insert(applicationMiddle);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationMiddle);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<ApplicationMiddle> edit(@PathVariable("id") String id){
-        MessageResult<ApplicationMiddle> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-
-            if (applicationMiddle != null) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationMiddle);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<ApplicationMiddle> update(@RequestBody ApplicationMiddle applicationMiddle,@RequestAttribute String subject){
-        MessageResult<ApplicationMiddle> msgResult = new MessageResult<>();
-
-        try {
-            applicationMiddle.setUpdateBy(subject);
-            applicationMiddle.setUpdateTime(new Date());
-            
-            int affectCount = applicationMiddleService.update(applicationMiddle);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationMiddle);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-            applicationMiddle.setDelFlag(true);
-            applicationMiddle.setUpdateBy(subject);
-            applicationMiddle.setUpdateTime(new Date());
-
-            int affectCount = applicationMiddleService.update(applicationMiddle);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-                applicationMiddle.setDelFlag(true);
-                applicationMiddle.setUpdateBy(subject);
-                applicationMiddle.setUpdateTime(new Date());
-
-                affectCount += applicationMiddleService.update(applicationMiddle);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(tabStatus)) {
-            searchParams.put("tabStatus",tabStatus);
-        }
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-        if (StringUtils.isNotEmpty(nameOrIdCard)) {
-            searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-        }
-
-        if (StringUtils.isNotEmpty(cardType)) {
-            searchParams.put("cardType",cardType);
-        }
-
-        //开始
-        if (StringUtils.isNotEmpty(startStatus)) {
-            searchParams.put("startStatus",startStatus);
-        }
-        //结束
-        if (StringUtils.isNotEmpty(endStatus)) {
-            searchParams.put("endStatus",endStatus);
-        }
-        if(StringUtils.isNotEmpty(isSend)){
-            searchParams.put("isSend", isSend);
-        }
-
-        if(StringUtils.isNotEmpty(offerId)){
-            searchParams.put("offerId", offerId);
-        }
-
-        searchParams.put("delFlag",delFlag);
-
-        if(StringUtils.isNotEmpty(schoolId)){
-            searchParams.put("code", "%" + schoolId + "%");
-        }else{
-            if (!userService.hasRole(subject,"SYSADMIN")) {
-                User user = userService.get(subject);
-                searchParams.put("code", "%" + user.getSchoolId() + "%");
-            }
-        }
-
-
-        //根据用户和角色查询
-        int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-        int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-        int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-        if(count1 > 0){
-            //管理员查全部
-        }else if(count2 > 0){
-            //领导查全部
-        }else if(count3 > 0){
-            //工作人员只能查网上初审10和现场初审20
-            List statusList = new ArrayList();
-            statusList.add("10");
-            statusList.add("20");
-            searchParams.put("orStatus",statusList);
-        }
-
-        Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-        for(ApplicationMiddleDTO applicationMiddleDTO : page.getResult()){
-            List<AttachmentDTO> attachmentDTOList = new ArrayList<>();
-            AttachmentDTO attachmentDTO = new AttachmentDTO();
-            DataDictionary dataDictionary = dataDictionaryService.findByParentIdAndValue(DataDictionary.STUDENT_RELATED_CERT_ID,"3");
-            attachmentDTO.setId(dataDictionary.getId());
-            attachmentDTO.setName(dataDictionary.getName());
-
-            List<String> studentFilesList = studentFilesService.findUrlByApplicationIdAndFileType(applicationMiddleDTO.getApplicationId(),attachmentDTO.getId());
-            attachmentDTO.setFiles(studentFilesList);
-            attachmentDTOList.add(attachmentDTO);
-
-            applicationMiddleDTO.setStudentCertificationFileList(attachmentDTOList);
-            applicationMiddleDTO.setRelationshipName(dataDictionaryService.getName(applicationMiddleDTO.getRelationship()));
-            applicationMiddleDTO.setTypeName(dataDictionaryService.findNameByCatalogNameAndValue("报名类型",applicationMiddleDTO.getType()));
-            applicationMiddleDTO.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddleDTO.getStatus()));
-            applicationMiddleDTO.setCardType(dataDictionaryService.findNameByCatalogNameAndValue("证件类型",applicationMiddleDTO.getCardType()));
-            applicationMiddleDTO.setCategoryName(dataDictionaryService.getName(applicationMiddleDTO.getCategoryId()));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="审核分类数")
-    @RequestMapping(value = "statusCount",method = RequestMethod.POST)
-    public MessageResult<Map> statusCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        Integer sum = 0;
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("中学招生审核流程");
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("tabStatus",dataDictionary.getValue());
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-            if(StringUtils.isNotEmpty(isSend)){
-                searchParams.put("isSend", isSend);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(dataDictionary.getValue(),page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="根据报名类型查询数量")
-    @RequestMapping(value = "categoryCount",method = RequestMethod.POST)
-    public MessageResult<Map> categoryCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        List<Sort> sortList2 = new ArrayList<>();
-        sortList2.add(new Sort("parent_id","asc"));
-        sortList2.add(new Sort("code_","asc"));
-
-        Map<String,Object> searchParams2 = new HashMap<>();
-
-        Integer sum = 0;
-        List<DataDictionary> dataDictionaryList = new ArrayList<>();
-        DataDictionary dA = dataDictionaryService.findByCatalogNameAndValue("报名类型","A");
-        DataDictionary dB = dataDictionaryService.findByCatalogNameAndValue("报名类型","B");
-        DataDictionary dC = dataDictionaryService.findByCatalogNameAndValue("报名类型","C");
-        dataDictionaryList.add(dA);
-        dataDictionaryList.add(dB);
-        dataDictionaryList.add(dC);
-        String categoryValue = "";
-
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            Map<String,Object> searchParams = new HashMap<>();
-            categoryId = dataDictionary.getId();
-            categoryValue = dataDictionary.getValue();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-
-            searchParams.put("type",dataDictionary.getValue());
-
-
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(categoryValue,page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="根据学校查询数量")
-    @RequestMapping(value = "schoolCount",method = RequestMethod.POST)
-    public MessageResult<Map> schoolCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        Integer sum = 0;
-        List<Sort> sortList2 = new ArrayList<>();
-        sortList2.add(new Sort("parent_id","asc"));
-        sortList2.add(new Sort("code_","asc"));
-
-        Map<String,Object> searchParams2 = new HashMap<>();
-
-        if (!userService.hasRole(subject,"SYSADMIN")) {
-            User user = userService.get(subject);
-            searchParams2.put("code", "%" + user.getSchoolId() + "%");
-        }
-        searchParams2.put("type", "1");//查学校
-        Page<SchoolInfo> scPage = schoolInfoService.pageSearch(searchParams2,0,10000,false,sortList2);
-
-        for(SchoolInfo sc : scPage.getResult()){
-            Map<String,Object> searchParams = new HashMap<>();
-            schoolId = sc.getId();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(sc.getId(),page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取详情")
-    @GetMapping("datail/{id}")
-    public MessageResult<Map> datail(@PathVariable("id") String id){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-
-            if (applicationMiddle != null) {
-                //学生信息
-                StudentInfo studentInfo = studentInfoService.get(applicationMiddle.getStudentId());
-                map.put("studentName",studentInfo.getName());
-                map.put("studentCardType",dataDictionaryService.findNameByCatalogNameAndValue("证件类型",studentInfo.getCardType()));
-                map.put("studentIdCard",studentInfo.getIdCard());
-                String sexName = studentInfo.getSex() == 1 ? "男" : "女";
-                map.put("studentSex",sexName);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                map.put("studentBirthday",sdf.format(studentInfo.getBirthday()));
-                PersonStudent personStudent = personStudentService.findByPersonIdAndStudentId(applicationMiddle.getPersonId(),applicationMiddle.getStudentId());
-                if(personStudent != null) {
-                    DataDictionary dataDictionary = dataDictionaryService.get(personStudent.getRelationship());
-                    map.put("relationship", dataDictionary.getName());
-                }
-                map.put("chooseReason",applicationMiddle.getChooseReason());
-                map.put("studentFilesList",fileMap2(applicationMiddle.getId(),"学生相关证明（"+applicationMiddle.getType()+"）"));
-
-                //申报人信息
-                PersonInfo personInfo = personInfoService.get(applicationMiddle.getPersonId());
-                map.put("personPhone",personInfo.getPhone());
-                map.put("typeName",dataDictionaryService.findNameByCatalogNameAndValue("报名类型",applicationMiddle.getType()));
-                map.put("status",applicationMiddle.getStatus());
-                map.put("statusName",dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus()));
-//                map.put("statusName","");正式居住房类型
-                map.put("address",studentInfo.getAddress());
-                SchoolInfo schoolInfo = schoolInfoService.get(applicationMiddle.getSchoolId());
-                map.put("schoolName",schoolInfo.getName());
-//                map.put("statusName","");正式居住房所有人与学生关系
-//                map.put("statusName","");不动产合同号
-                map.put("personName",personInfo.getName());
-                map.put("personIdCard",personInfo.getIdCard());
-                map.put("personFilesList",fileMap1(applicationMiddle.getId(),"其他相关证明（"+applicationMiddle.getType()+"）"));
-                SchoolInfo offSchoolInfo = schoolInfoService.get(applicationMiddle.getOfferId());
-                if(offSchoolInfo != null) {
-                    map.put("offerName",offSchoolInfo.getName());
-                }else{
-                    map.put("offerName","");
-                }
-
-                map.put("offerCode",applicationMiddle.getOfferCode());
-
-                //审核记录
-                List<ApprovalInfo> approvalInfoList = approvalInfoService.findByApplicationId(applicationMiddle.getId());
-                for(ApprovalInfo approvalInfo : approvalInfoList){
-                    User user = userService.get(approvalInfo.getCreateBy());
-                    if(user != null) {
-                        approvalInfo.setCreateBy(user.getRealName());
-                    }else {
-                        approvalInfo.setCreateBy(personInfo.getName());
-                    }
-
-                    if(StringUtils.isNotEmpty(approvalInfo.getFileUrl())) {
-                        approvalInfo.setFileUrlList(new ArrayList<>(Arrays.asList(approvalInfo.getFileUrl().split(","))));
-                    }
-                }
-                map.put("approvalInfoList",approvalInfoList);
-
-                msgResult.setResult(true);
-                msgResult.setData(map);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    private Map<String,Object> fileMap1(String applicationId,String catalogName){
-        Map<String,Object> map = new HashMap<>();
-
-        ApplicationMiddle applicationMiddle = applicationMiddleService.get(applicationId);
-
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName(catalogName);
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            //A,B,C类证明附件查找,先判断字典类型ID与申请表的保存的类型相同
-            if(applicationMiddle.getCategoryId().equals(dataDictionary.getId())){
-            if(dataDictionary.getDataType().equals("2")) {
-                AttachmentDTO attachmentDTO = new AttachmentDTO();
-                attachmentDTO.setId(dataDictionary.getId());
-                attachmentDTO.setName(dataDictionary.getName());
-                attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionary.getId()));
-                map.put(dataDictionary.getSortNo().toString(), attachmentDTO);
-            }else{
-                Map<String,Object> mapEx = new HashMap<>();
-                List<DataDictionary> dataDictionaryListEx = dataDictionaryService.findByParentId(dataDictionary.getId());
-                for(DataDictionary dataDictionaryEx : dataDictionaryListEx) {
-                    AttachmentDTO attachmentDTO = new AttachmentDTO();
-                    attachmentDTO.setId(dataDictionaryEx.getId());
-                    attachmentDTO.setName(dataDictionaryEx.getName());
-                    attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionaryEx.getId()));
-                    mapEx.put(dataDictionaryEx.getSortNo().toString(), attachmentDTO);
-
-                    if(attachmentDTO.getFiles().size() != 0){
-                        map.put("id", dataDictionary.getName());
-                        map.put("value", mapEx);
-                    }
-                }
-            }
-            }
-        }
-
-        return map;
-    }
-
-    /**
-     * shuzhan
-     * 查找A,B,C类附件
-     * @param applicationId
-     * @param catalogName
-     * @return
-     */
-    private Map<String,Object> fileMap2(String applicationId,String catalogName){
-        Map<String,Object> map = new HashMap<>();
-
-        ApplicationMiddle applicationMiddle = applicationMiddleService.get(applicationId);
-
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName(catalogName);
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            //A,B,C类证明附件查找,先判断字典类型ID与申请表的保存的类型相同
-//            if(applicationMiddle.getCategoryId().equals(dataDictionary.getId())){
-                if(dataDictionary.getDataType().equals("2")) {
-                    AttachmentDTO attachmentDTO = new AttachmentDTO();
-                    attachmentDTO.setId(dataDictionary.getId());
-                    attachmentDTO.setName(dataDictionary.getName());
-                    attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionary.getId()));
-                    map.put(dataDictionary.getSortNo().toString(), attachmentDTO);
-                }else{
-                    Map<String,Object> mapEx = new HashMap<>();
-                    List<DataDictionary> dataDictionaryListEx = dataDictionaryService.findByParentId(dataDictionary.getId());
-                    for(DataDictionary dataDictionaryEx : dataDictionaryListEx) {
-                        AttachmentDTO attachmentDTO = new AttachmentDTO();
-                        attachmentDTO.setId(dataDictionaryEx.getId());
-                        attachmentDTO.setName(dataDictionaryEx.getName());
-                        attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionaryEx.getId()));
-                        mapEx.put(dataDictionaryEx.getSortNo().toString(), attachmentDTO);
-
-                        if(attachmentDTO.getFiles().size() != 0){
-                            map.put("id", dataDictionary.getName());
-                            map.put("value", mapEx);
-                        }
-                    }
-                }
-//            }
-        }
-
-        return map;
-    }
-
-    @ApiOperation(value="退回")
-    @RequestMapping(value = "back",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> back(String id,String remark,String fileUrl,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            User user = userService.get(subject);
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus())+"：退回");
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl(fileUrl);
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-            if (affectCount > 0) {
-                applicationMiddle.setStatus("5");
-                applicationMiddle.setUpdateBy(subject);
-                applicationMiddle.setUpdateTime(new Date());
-                applicationMiddleService.update(applicationMiddle);
-
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                String backDate = sdf.format(new Date());
-//                SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
-                String backRemark = remark;
-                PersonInfo pi = personInfoService.get(applicationMiddle.getPersonId());
-                String appId = wechatConfig.getAppId();
-                String appSecret = wechatConfig.getAppSecret();
-
-                boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                        user.getUserName(),"申请入学信息已被退回,请尽快按退回意见修改提交,报名时间到7月25日晚上12点截止",
-                        backRemark,backDate,pi.getOpenId(),
-                        wechatConfig.getBackNoticeTemplateId(),wechatConfig.getTokenUrl(),appId,appSecret);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="前进")
-    @RequestMapping(value = "fore",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> fore(String id,String remark,String fileUrl,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus())+"：通过");
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl(fileUrl);
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-            if (affectCount > 0) {
-                if("40".equals(applicationMiddle.getStatus())) {
-                    if("D".equals(applicationMiddle.getType()) || "E".equals(applicationMiddle.getType())){
-                        applicationMiddle.setStatus("70");
-                        applicationMiddle.setOfferId(applicationMiddle.getSchoolId());
-                    }else{
-                        applicationMiddle.setStatus("60");
-                    }
-                }else if("50".equals(applicationMiddle.getStatus())) {
-                    if("D".equals(applicationMiddle.getType()) || "E".equals(applicationMiddle.getType())){
-                        applicationMiddle.setStatus("70");
-                        applicationMiddle.setOfferId(applicationMiddle.getSchoolId());
-                    }else{
-                        applicationMiddle.setStatus(String.valueOf(Integer.parseInt(applicationMiddle.getStatus()) + 10));
-                    }
-                }else{
-                    applicationMiddle.setStatus(String.valueOf(Integer.parseInt(applicationMiddle.getStatus()) + 10));
-                }
-
-                applicationMiddle.setUpdateBy(subject);
-                applicationMiddle.setUpdateTime(new Date());
-                applicationMiddleService.update(applicationMiddle);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="翻页")
-    @RequestMapping(value = "pageTurn",method = RequestMethod.POST)
-    public MessageResult<Map> pageTurn(String id,String type,String nameOrIdCard,String status,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","asc"));
-
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-        if (StringUtils.isNotEmpty(nameOrIdCard)) {
-            searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-        }
-
-        Map<String,Object> map = new HashMap<>();
-        Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,1,10000,false,sortList);
-        for(int i=0;i<page.size();i++){
-            ApplicationMiddleDTO applicationMiddleDTO = page.get(i);
-            if(applicationMiddleDTO.getApplicationId().equals(id)){
-                if(i > 0) {
-                    map.put("pagePrevious",page.get(i - 1).getApplicationId());
-                }
-                if(i < page.size()-1) {
-                    map.put("pageNext",page.get(i + 1).getApplicationId());
-                }
-            }
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value = "导出")
-    @PostMapping("exportXls")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "姓名", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "idCard", value = "身份证", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "phone", value = "手机号", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "parentId", value = "企业编号", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "subordinate", value = "是否查询下级单位", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position1", value = "一级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position2", value = "二级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position3", value = "三级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position4", value = "四级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position5", value = "五级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "faceBound", value = "是否同步", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "isUploadPhoto", value = "是否上传照片", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "popedom", value = "用户角色", required = false, paramType = "form", dataType = "String")
-    })
-    public MessageResult<String> exportXls(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject) {
-        MessageResult<String> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-
-
-        try {
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            HSSFSheet sheet = workbook.createSheet();
-            //表头
-            HSSFRow rowTitle = sheet.createRow(0);
-            HSSFCell cellTitle1 = rowTitle.createCell(0);
-            cellTitle1.setCellValue("序号");
-            HSSFCell cellTitle2 = rowTitle.createCell(1);
-            cellTitle2.setCellValue("报名类型");
-            HSSFCell cellTitle3 = rowTitle.createCell(2);
-            cellTitle3.setCellValue("报名学校");
-            HSSFCell cellTitle4 = rowTitle.createCell(3);
-            cellTitle4.setCellValue("学生姓名");
-            HSSFCell cellTitle5 = rowTitle.createCell(4);
-            cellTitle5.setCellValue("证件类型");
-            HSSFCell cellTitle6 = rowTitle.createCell(5);
-            cellTitle6.setCellValue("证件号码");
-            HSSFCell cellTitle7 = rowTitle.createCell(6);
-            cellTitle7.setCellValue("审核状态");
-            HSSFCell cellTitle8 = rowTitle.createCell(7);
-            cellTitle8.setCellValue("申请时间");
-            HSSFCell cellTitle9 = rowTitle.createCell(8);
-            cellTitle9.setCellValue("登记人关系");
-            HSSFCell cellTitle10 = rowTitle.createCell(9);
-            cellTitle10.setCellValue("登记人姓名");
-            HSSFCell cellTitle11 = rowTitle.createCell(10);
-            cellTitle11.setCellValue("登记人手机号码");
-            HSSFCell cellTitle12 = rowTitle.createCell(11);
-            cellTitle12.setCellValue("学生地址");
-            HSSFCell cellTitle13 = rowTitle.createCell(12);
-            cellTitle13.setCellValue("");
-            HSSFCell cellTitle14 = rowTitle.createCell(13);
-            cellTitle14.setCellValue("");
-            HSSFCell cellTitle15 = rowTitle.createCell(14);
-            cellTitle15.setCellValue("");
-            HSSFCell cellTitle16 = rowTitle.createCell(15);
-            cellTitle16.setCellValue("");
-            HSSFCell cellTitle17 = rowTitle.createCell(16);
-            cellTitle17.setCellValue("");
-
-//            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
-//            for(int i = 1; i < maxColumn; i++) {
-//                //int columnWidth = sheet.getColumnWidth(i) / 256;
-//                sheet.setColumnWidth(i, 12 * 256);
-//            }
-            //学校
-            sheet.setColumnWidth(2, 20 * 256);
-            //身份证
-            sheet.setColumnWidth(5, 24 * 256);
-            //报名时间
-            sheet.setColumnWidth(7, 24 * 256);
-            //登记人手机号
-            sheet.setColumnWidth(10, 15 * 256);
-            //地址
-            sheet.setColumnWidth(11, 50 * 256);
-
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.create_time","desc"));
-
-            if (StringUtils.isNotEmpty(tabStatus)) {
-                searchParams.put("tabStatus",tabStatus);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            //查询范围
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,0,100000,true,sortList);
-            List<DataDictionary> relationshipList = dataDictionaryService.findByCatalogName("学生关系");
-            List<DataDictionary> typeNameList = dataDictionaryService.findByCatalogName("报名类型");
-            List<DataDictionary> statusNameList = dataDictionaryService.findByCatalogName("中学招生审核流程");
-            List<DataDictionary> cardTypeList = dataDictionaryService.findByCatalogName("证件类型");
-            for (int i = 0; i < page.size(); i++) {
-                ApplicationMiddleDTO amDTO = page.get(i);
-                String relationship = relationshipList.stream()
-                        .filter(e -> e.getId().equals(amDTO.getRelationship()))
-                        .findFirst().get().getName();
-                String typeName = typeNameList.stream()
-                        .filter(e -> e.getValue().equals(amDTO.getType()))
-                        .findFirst().get().getName();
-                String statusName = statusNameList.stream()
-                        .filter(e -> e.getValue().equals(amDTO.getStatus()))
-                        .findFirst().get().getName();
-                String cardTypeName = cardTypeList.stream()
-                        .filter(e -> e.getValue().equals(amDTO.getCardType()))
-                        .findFirst().get().getName();
-
-                HSSFRow rowContent = sheet.createRow(i + 1);
-                //"序号"
-                HSSFCell cellContent1 = rowContent.createCell(0);
-                cellContent1.setCellValue(i + 1);
-//                "报名类型"
-                HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(typeName);
-//                "报名学校"
-                HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(amDTO.getSchoolName());
-//                "学生姓名"
-                HSSFCell cellContent4 = rowContent.createCell(3);
-                cellContent4.setCellValue(amDTO.getName());
-//                "证件类型"
-                HSSFCell cellContent5 = rowContent.createCell(4);
-                cellContent5.setCellValue(cardTypeName);
-//                "证件号码"
-                HSSFCell cellContent6 = rowContent.createCell(5);
-                cellContent6.setCellValue(amDTO.getIdCard());
-//                "审核状态"
-                HSSFCell cellContent7 = rowContent.createCell(6);
-                cellContent7.setCellValue(statusName);
-//                "申请时间"
-                HSSFCell cellContent8 = rowContent.createCell(7);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                cellContent8.setCellValue(sdf.format(amDTO.getCreateTime()));
-                //"登记人关系"
-                HSSFCell cellContent9 = rowContent.createCell(8);
-                cellContent9.setCellValue(relationship);
-
-                if(StringUtils.isNotEmpty(amDTO.getPersonId())){
-                    //"登记人姓名"
-                    HSSFCell cellContent10 = rowContent.createCell(9);
-                    PersonInfo pi =personInfoService.get(amDTO.getPersonId());
-                    cellContent10.setCellValue(pi.getName());
-
-                    //"登记人手机号码"
-                    HSSFCell cellContent11 = rowContent.createCell(10);
-                    cellContent11.setCellValue(pi.getPhone());
-                }
-
-                //"学生地址"
-                HSSFCell cellContent12 = rowContent.createCell(11);
-                cellContent12.setCellValue(amDTO.getAddress());
-
-                List<Sort> sortList2 = new ArrayList<>();
-                sortList2.add(new Sort("create_time","asc"));
-                Map<String,Object> searchParams2 = new HashMap<>();
-                searchParams2.put("applicationId",amDTO.getApplicationId());
-                List<String> operationList = new ArrayList<String>();
-                operationList.add("%待网上初审：通过%");
-                operationList.add("%待现场复审：通过%");
-                searchParams2.put("operationList",operationList);
-                searchParams2.put("delFlag",false);
-                Page<ApprovalInfo> aiPage = approvalInfoService.pageSearch(searchParams2,0,1000,false,sortList2);
-                List<ApprovalInfo> apList = aiPage.getResult();
-                for(int b =0;b<apList.size();b++){
-                    HSSFCell cellContent = rowContent.createCell(b+12);
-                    ApprovalInfo ap = apList.get(b);
-                    cellContent.setCellValue(ap.getRemark());
-                }
-            }
-
-            //todo 将wb保存到oss
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            workbook.write(output);
-
-            byte[] buffer = output.toByteArray();
-            ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-            String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-            //todo 返回导入失败报表下载链接
-
-            msgResult.setData(downloadUrl);
-            msgResult.setResult(true);
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="发送微信消息")
-    @RequestMapping(value = "sendWechatMessage",method = RequestMethod.POST)
-    public MessageResult<Integer> sendWechatMessage(
-            String idList,
-            String message,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Integer> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-        try {
-            String appId = wechatConfig.getAppId();
-            String appSecret = wechatConfig.getAppSecret();
-            String []ids = idList.split(",");
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            String sendDate = sdf.format(new Date());
-            int messageNum = 0;
-            for(String id: ids){
-                ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-                PersonInfo personInfo = personInfoService.get(applicationMiddle.getPersonId());
-                boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                        user.getUserName(),message,
-                        "",sendDate,personInfo.getOpenId(),
-                        wechatConfig.getBackNoticeTemplateId(),
-                        wechatConfig.getTokenUrl(),
-                        appId,appSecret);
-                if(messageResult){
-                    applicationMiddle.setIsSend(true);
-                    applicationMiddle.setSendTime(new Date());
-                    applicationMiddleService.update(applicationMiddle);
-                    messageNum ++ ;
-                }
-            }
-
-            msgResult.setResult(true);
-            msgResult.setData(messageNum);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-        return msgResult;
-    }
-
-    @ApiOperation(value="调剂")
-    @RequestMapping(value = "tjMiddle",method = RequestMethod.POST)
-    public MessageResult<Integer> tjMiddle(
-            String id,
-            String schoolId,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Integer> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-        int count = 0;
-        try {
-            ApplicationMiddle am = applicationMiddleService.get(id);
-            am.setOfferId(schoolId);
-            am.setStatus("70");
-            am.setUpdateBy(subject);
-            am.setUpdateTime(new Date());
-            count = applicationMiddleService.update(am);
-
-            msgResult.setResult(true);
-            msgResult.setData(count);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-        return msgResult;
-    }
-
-    @ApiOperation(value="修改状态")
-    @RequestMapping(value = "updateStatus",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> updateStatus(String id,String remark,String status,String typeValue,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(id);
-            User user = userService.get(subject);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            if("90".equals(status)) {
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus()));
-            }else{
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus())+"：" + typeValue);
-            }
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl("");
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-
-
-            if (affectCount > 0) {
-                applicationMiddle.setStatus(status);
-                applicationMiddle.setUpdateBy(subject);
-                applicationMiddle.setUpdateTime(new Date());
-
-                if("60".equals(status) && "退回".equals(typeValue)){
-                    applicationMiddle.setOfferId("");
-                    List<ApportionDetail> adList = apportionDetailService.findByStudentId(applicationMiddle.getStudentId());
-                    for(ApportionDetail ad : adList){
-                        ad.setDelFlag(true);
-                        apportionDetailService.update(ad);
-                    }
-                }else if("90".equals(status)){
-                    //获取最大编号
-                    int serialNum = offerInfoService.findMaxSerialNum(applicationMiddle.getSchoolId(),"2");
-                    serialNum = serialNum+1;//最大编号加一
-                    Calendar date = Calendar.getInstance();
-                    String year = String.valueOf(date.get(Calendar.YEAR));
-                    SchoolInfo si = schoolInfoService.get(applicationMiddle.getSchoolId());
-                    //开发区+年份+学校编号2位+序号4位
-                    String code = "KFQ" + year + si.getSchoolCode() + String.format("%04d", serialNum);
-                    //保存录取信息表
-                    OfferInfo off = new OfferInfo();
-                    off.setId(UUID.randomUUID().toString());
-
-                    off.setApplicationId(applicationMiddle.getId());
-                    off.setStudentId(applicationMiddle.getStudentId());
-                    off.setEnrollmentType("2");//中学
-                    off.setSchoolId(applicationMiddle.getOfferId());
-                    off.setSerialNum(serialNum);
-                    off.setCode(code);
-
-                    applicationMiddle.setOfferCode(code);
-
-                    SchoolInfo schoolInfo = schoolInfoService.get(applicationMiddle.getOfferId());
-                    PersonInfo personInfo = personInfoService.get(applicationMiddle.getPersonId());
-                    StudentInfo studentInfo = studentInfoService.get(applicationMiddle.getStudentId());
-                    String bdUrl = toPressText(code,personInfo.getName(),studentInfo.getName(), schoolInfo.getName());
-                    String uploadUrl = uploadImg(bdUrl);
-                    if(StringUtils.isNotEmpty(uploadUrl)) {
-                        off.setDelFlag(false);
-                        off.setCreateBy(subject);
-                        off.setCreateTime(new Date());
-                        offerInfoService.insert(off);
-                        applicationMiddle.setOfferImg(uploadUrl);
-                        new Thread(() -> {
-                            try {
-                                String content =  "尊敬的家长您好，您的报名申请已通过，请前往“荆州开发区网上入学”--报名查询，下载电子版入学通知书。";
-                                sendMessage(content,applicationMiddle.getPersonId(),user.getRealName());
-                            } catch (Exception ex) {
-                                ex.printStackTrace();
-                            }
-                        }).start();
-                    }else{
-                        applicationMiddle.setStatus("80");
-                    }
-                }
-                applicationMiddleService.update(applicationMiddle);
-
-                String uploadPath = Resource.class.getResource("/").getPath() +"uploadImg";
-                delAllFile(uploadPath);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="全部通过")
-    @RequestMapping(value = "allNext",method = RequestMethod.POST)
-    public MessageResult<Map> allNext(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="nextStatus",defaultValue="") String nextStatus,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-        User user = userService.get(subject);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.school_id","asc"));
-        sortList.add(new Sort("a.type_","asc"));
-        sortList.add(new Sort("a.offer_code","asc"));
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(tabStatus)) {
-            searchParams.put("tabStatus",tabStatus);
-        }
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-        if (StringUtils.isNotEmpty(nameOrIdCard)) {
-            searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-        }
-
-        if (StringUtils.isNotEmpty(cardType)) {
-            searchParams.put("cardType",cardType);
-        }
-
-        searchParams.put("delFlag",delFlag);
-
-        if(StringUtils.isNotEmpty(schoolId)){
-            searchParams.put("code", "%" + schoolId + "%");
-        }else{
-            if (!userService.hasRole(subject,"SYSADMIN")) {
-
-                searchParams.put("code", "%" + user.getSchoolId() + "%");
-            }
-        }
-
-        if(StringUtils.isNotEmpty(isSend)){
-            searchParams.put("isSend", isSend);
-        }
-
-        if(StringUtils.isNotEmpty(offerId)){
-            searchParams.put("offerId", offerId);
-        }
-
-        //查询范围
-        //开始
-        if (StringUtils.isNotEmpty(startStatus)) {
-            searchParams.put("startStatus",startStatus);
-        }
-        //结束
-        if (StringUtils.isNotEmpty(endStatus)) {
-            searchParams.put("endStatus",endStatus);
-        }
-
-        if (StringUtils.isNotEmpty(categoryId)) {
-            searchParams.put("categoryId",categoryId);
-        }
-
-        //根据用户和角色查询
-        int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-        int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-        int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-        if(count1 > 0){
-            //管理员查全部
-        }else if(count2 > 0){
-            //领导查全部
-        }else if(count3 > 0){
-            //工作人员只能查网上初审10和现场初审20
-            List statusList = new ArrayList();
-            statusList.add("10");
-            statusList.add("20");
-            searchParams.put("orStatus",statusList);
-        }
-
-        Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,0,100000,false,sortList);
-        for(ApplicationMiddleDTO applicationMiddleDTO : page.getResult()){
-            ApplicationMiddle applicationMiddle = applicationMiddleService.get(applicationMiddleDTO.getApplicationId());
-            if("40".equals(applicationMiddle.getStatus())) {
-                if("D".equals(applicationMiddle.getType()) || "E".equals(applicationMiddle.getType())){
-                    applicationMiddle.setStatus("70");
-                    applicationMiddle.setOfferId(applicationMiddle.getSchoolId());
-                }else{
-                    applicationMiddle.setStatus(nextStatus);
-                }
-            }else if("50".equals(applicationMiddle.getStatus())) {
-                if("D".equals(applicationMiddle.getType()) || "E".equals(applicationMiddle.getType())){
-                    applicationMiddle.setStatus("70");
-                    applicationMiddle.setOfferId(applicationMiddle.getSchoolId());
-                }else{
-                    applicationMiddle.setStatus(nextStatus);
-                }
-            }else if("70".equals(applicationMiddle.getStatus())){
-                //微信消息推送 发送预录取通知
-                applicationMiddle.setStatus(nextStatus);
-//                new Thread(() -> {
-//                        try {
-//                            String content =  "尊敬的家长您好，您的报名申请已通过。关注“荆州开发区网上入学”--报名查询，我们将于近期推送电子版入学通知书。";
-//                            sendMessage(content,applicationMiddle.getPersonId(),user.getRealName());
-//                        } catch (Exception ex) {
-//                            ex.printStackTrace();
-//                        }
-//                    }).start();
-            }else if("80".equals(applicationMiddle.getStatus())){
-                //微信消息推送 发送完成录取通知
-                applicationMiddle.setStatus(nextStatus);
-
-                int serialNum = offerInfoService.findMaxSerialNum(applicationMiddle.getSchoolId(),"2");
-                serialNum = serialNum+1;//最大编号加一
-                Calendar date = Calendar.getInstance();
-                String year = String.valueOf(date.get(Calendar.YEAR));
-                SchoolInfo si = schoolInfoService.get(applicationMiddle.getSchoolId());
-                //开发区+年份+学校编号2位+序号4位
-                String code = "KFQ" + year + si.getSchoolCode() + String.format("%04d", serialNum);
-                //保存录取信息表
-                OfferInfo off = new OfferInfo();
-                off.setId(UUID.randomUUID().toString());
-
-                off.setApplicationId(applicationMiddle.getId());
-                off.setStudentId(applicationMiddle.getStudentId());
-                off.setEnrollmentType("2");//小学
-                off.setSchoolId(applicationMiddle.getOfferId());
-                off.setSerialNum(serialNum);
-                off.setCode(code);
-                applicationMiddle.setOfferCode(code);
-
-                SchoolInfo schoolInfo = schoolInfoService.get(applicationMiddle.getOfferId());
-                PersonInfo personInfo = personInfoService.get(applicationMiddle.getPersonId());
-                StudentInfo studentInfo = studentInfoService.get(applicationMiddle.getStudentId());
-                String bdUrl = toPressText(code, personInfo.getName(), studentInfo.getName(), schoolInfo.getName());
-                String uploadUrl = uploadImg(bdUrl);
-                if(StringUtils.isNotEmpty(uploadUrl)){
-                    off.setDelFlag(false);
-                    off.setCreateBy(subject);
-                    off.setCreateTime(new Date());
-                    offerInfoService.insert(off);
-                    applicationMiddle.setOfferImg(uploadUrl);
-                    new Thread(() -> {
-                        try {
-                            String content =  "尊敬的家长您好，您的报名申请已通过，请前往“荆州开发区网上入学”--报名查询，下载电子版入学通知书。";
-                            sendMessage(content,applicationMiddle.getPersonId(),user.getRealName());
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
-                        }
-                    }).start();
-                }else{
-                    applicationMiddle.setStatus("80");
-                }
-            }else{
-                applicationMiddle.setStatus(nextStatus);
-            }
-
-            applicationMiddle.setUpdateBy(subject);
-            applicationMiddle.setUpdateTime(new Date());
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(applicationMiddle.getId());
-            if("80".equals(status)) {
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus()));
-            }else{
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus())+"：通过审核");
-            }
-            approvalInfo.setRemark("通过审核");
-            approvalInfo.setFileUrl("");
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-            applicationMiddleService.update(applicationMiddle);
-        }
-
-
-        //完成后删除文件夹
-        String uploadPath = Resource.class.getResource("/").getPath() +"uploadImg";
-        delAllFile(uploadPath);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    public String toPressText(String offerCode,String personName,String userName,String schoolName){
-        String in = "static/middle_tzs.jpg";
-        String out = "uploadImg/middle_tzs_" + offerCode + ".jpg";
-        String inImg = Resource.class.getResource("/").getPath() + in;
-        String outImg = Resource.class.getResource("/").getPath() + out;
-
-        try{
-            BufferedImage im =ImageIO.read(new FileInputStream(inImg));
-            int mothh = DateUtil.thisMonth() +1;
-            Graphics g = im.getGraphics();
-            g.setColor(new Color(0,0,0));
-            Font font = new Font("宋体",Font.PLAIN,40);  //设置字体
-            g.setFont(font);
-            Random ran = new Random();  // 随机位置
-            g.drawString(offerCode,1000,400);
-            g.drawString(personName,410,600);
-            g.drawString(userName,830,680);
-            g.drawString("8",730,940);
-            g.drawString("25",820,940);
-            g.drawString("8",980,940);
-            g.drawString("25",1050,940);
-            g.drawString(schoolName,580,1015);
-            g.drawString(mothh+"",1000,1590);
-            g.drawString(DateUtil.thisDayOfMonth()+"",1060,1590);
-            g.dispose();
-            ImageIO.write(im,"jpg",new File(outImg));
-        }catch (IOException e){
-            e.printStackTrace();
-        }
-        return outImg;
-
-        //加水印
-//        pressText(offerCode,outImg,"宋体",0,new Color(0,0,0),40,1000,400);
-//        pressText(personName,outImg,"宋体",0,new Color(0,0,0),40,410,600);
-//        pressText(userName,outImg,"宋体",0,new Color(0,0,0),40,830,680);
-//        pressText("8",outImg,"宋体",0,new Color(0,0,0),40,660,940);
-//        pressText("25",outImg,"宋体",0,new Color(0,0,0),40,730,940);
-//        pressText("8",outImg,"宋体",0,new Color(0,0,0),40,890,940);
-//        pressText("25",outImg,"宋体",0,new Color(0,0,0),40,970,940);
-//        pressText(schoolName,outImg,"宋体",0,new Color(0,0,0),40,480,1015);
-//        pressText(DateUtil.thisMonth()+"",outImg,"宋体",0,new Color(0,0,0),40,1000,1590);
-//        pressText(DateUtil.thisDayOfMonth()+"",outImg,"宋体",0,new Color(0,0,0),40,1060,1590);
-    }
-
-    public void pressText(String pressText, String targetImg, String fontName, int fontStyle, Color color, int fontSize, int x, int y){
-//        try{
-//            File _file = new File(targetImg);
-//            Image src = ImageIO.read(_file);
-//            int weidth = src.getWidth(null);
-//            int height = src.getHeight(null);
-//            BufferedImage image = new BufferedImage(weidth,height,BufferedImage.TYPE_INT_RGB);
-//            Graphics g = image.createGraphics();
-//            g.drawImage(src,0,0,weidth,height,null);
-//            g.setColor(color);
-//            g.setFont(new Font(fontName,fontStyle,fontSize));
-//            g.drawString(pressText,x,y);
-//            g.dispose();
-//            FileOutputStream out = new FileOutputStream(targetImg);
-//            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-//            encoder.encode(image);
-//            out.close();
-//        } catch (java.io.IOException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-    public String uploadImg(String imgUrl){
-        String returnUrl = "";
-        try {
-            File jpgFile = new File(imgUrl);
-            InputStream input = new FileInputStream(jpgFile);
-            returnUrl = OSSUtil.upload(ossConfig, "/forPerson", jpgFile.getName(), input);
-            if (StringUtils.isNotEmpty(returnUrl)) {
-                jpgFile.delete();
-            }
-            input.close();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
-        return returnUrl;
-    }
-
-    public boolean sendMessage(String content,String personId,String adminName){
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String backDate = sdf.format(new Date());
-//                SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
-        String backRemark = "";
-        PersonInfo pi = personInfoService.get(personId);
-        String appId = wechatConfig.getAppId();
-        String appSecret = wechatConfig.getAppSecret();
-        boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                adminName,content,
-                backRemark,backDate,pi.getOpenId(),
-                wechatConfig.getBackNoticeTemplateId(),wechatConfig.getTokenUrl(),appId,appSecret);
-        return messageResult;
-    }
-
-    public static void delAllFile(String path) {
-        File file = new File(path);
-        if (!file.exists()) {
-            return;
-        }
-        if (!file.isDirectory()) {
-            return;
-        }
-        String[] tempList = file.list();
-        if (tempList == null) {
-            return;
-        }
-        File temp;
-        for (String aTempList : tempList) {
-            if (path.endsWith(File.separator)) {
-                temp = new File(path + aTempList);
-            } else {
-                temp = new File(path + File.separator + aTempList);
-            }
-            if (temp.isFile()) {
-                temp.delete();
-            }
-            if (temp.isDirectory()) {
-                delAllFile(path + "/" + aTempList);// 先删除文件夹里面的文件
-            }
-        }
-    }
-
-
-    @ApiOperation(value="修改新类型")
-    @PostMapping("changeNewType")
-    public MessageResult<Integer> changeNewType(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("type", "C");
-            searchParams.put("delFlag", false);
-            Page<ApplicationMiddle> page = applicationMiddleService.pageSearch(searchParams,0,100000,false,sortList);
-
-            for (ApplicationMiddle am : page.getResult()) {
-                List<ApprovalInfo> aiList = approvalInfoService.findByApplicationIdAndOperation(am.getId(),"%C%");
-                if(aiList.size() > 0){
-                    ApprovalInfo ai = aiList.get(0);
-                    am.setNewType(ai.getRemark());
-                    applicationMiddleService.update(am);
-                }
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("操作失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value = "导出录取信息")
-    @PostMapping("exportOverXls")
-    public MessageResult<String> exportOverXls(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject) {
-        MessageResult<String> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-
-
-        try {
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            HSSFSheet sheet = workbook.createSheet();
-            //表头
-            HSSFRow rowTitle = sheet.createRow(0);
-            HSSFCell cellTitle1 = rowTitle.createCell(0);
-            cellTitle1.setCellValue("序号");
-            HSSFCell cellTitle2 = rowTitle.createCell(1);
-            cellTitle2.setCellValue("录取学校");
-            HSSFCell cellTitle3 = rowTitle.createCell(2);
-            cellTitle3.setCellValue("录取编号");
-            HSSFCell cellTitle4 = rowTitle.createCell(3);
-            cellTitle4.setCellValue("报名类型");
-            HSSFCell cellTitle5 = rowTitle.createCell(4);
-            cellTitle5.setCellValue("学生姓名");
-            HSSFCell cellTitle6 = rowTitle.createCell(5);
-            cellTitle6.setCellValue("证件号码");
-            HSSFCell cellTitle7 = rowTitle.createCell(6);
-            cellTitle7.setCellValue("申请时间");
-            HSSFCell cellTitle8 = rowTitle.createCell(7);
-            cellTitle8.setCellValue("登记人姓名");
-            HSSFCell cellTitle9 = rowTitle.createCell(8);
-            cellTitle9.setCellValue("联系电话");
-            HSSFCell cellTitle10 = rowTitle.createCell(9);
-            cellTitle10.setCellValue("学生地址");
-
-//            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
-//            for(int i = 1; i < maxColumn; i++) {
-//                //int columnWidth = sheet.getColumnWidth(i) / 256;
-//                sheet.setColumnWidth(i, 12 * 256);
-//            }
-
-            sheet.setColumnWidth(1, 20 * 256);
-            sheet.setColumnWidth(2, 20 * 256);
-            sheet.setColumnWidth(3, 10 * 256);
-            sheet.setColumnWidth(4, 15 * 256);
-            sheet.setColumnWidth(5, 25 * 256);
-            sheet.setColumnWidth(6, 20 * 256);
-            sheet.setColumnWidth(7, 15 * 256);
-            sheet.setColumnWidth(8, 20 * 256);
-            sheet.setColumnWidth(9, 40 * 256);
-
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.school_id","asc"));
-            sortList.add(new Sort("a.type_","asc"));
-            sortList.add(new Sort("a.category_id","desc"));
-            sortList.add(new Sort("a.offer_code","asc"));
-            sortList.add(new Sort("a.create_time","desc"));
-
-            if (StringUtils.isNotEmpty(tabStatus)) {
-                searchParams.put("tabStatus",tabStatus);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                    searchParams.put("type", type);
-                }else{
-                    searchParams.put("type", "C");
-                    searchParams.put("categoryId", type);
-                }
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            if(StringUtils.isNotEmpty(isSend)){
-                searchParams.put("isSend", isSend);
-            }
-
-            if(StringUtils.isNotEmpty(offerId)){
-                searchParams.put("offerId", offerId);
-            }
-
-            //查询范围
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,0,10000000,false,sortList);
-
-            for (int i = 0; i < page.size(); i++) {
-                ApplicationMiddleDTO amDTO = page.get(i);
-
-                HSSFRow rowContent = sheet.createRow(i + 1);
-                //"序号"
-                HSSFCell cellContent1 = rowContent.createCell(0);
-                cellContent1.setCellValue(i + 1);
-//                "录取学校"
-                HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(amDTO.getOfferName());
-//                "录取编号"
-                HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(amDTO.getOfferCode());
-//                "报名类型"
-                HSSFCell cellContent4 = rowContent.createCell(3);
-                cellContent4.setCellValue(amDTO.getType());
-//                "学生姓名"
-                HSSFCell cellContent5 = rowContent.createCell(4);
-                cellContent5.setCellValue(amDTO.getName());
-//                "证件号码"
-                HSSFCell cellContent6 = rowContent.createCell(5);
-                cellContent6.setCellValue(amDTO.getIdCard());
-//                "申请时间"
-                HSSFCell cellContent7 = rowContent.createCell(6);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                cellContent7.setCellValue(sdf.format(amDTO.getCreateTime()));
-                //"登记人姓名"
-                HSSFCell cellContent8 = rowContent.createCell(7);
-                cellContent8.setCellValue(amDTO.getPersonName());
-                //联系电话
-                HSSFCell cellContent9 = rowContent.createCell(8);
-                cellContent9.setCellValue(amDTO.getPersonPhone());
-                //"学生地址"
-                HSSFCell cellContent10 = rowContent.createCell(9);
-                cellContent10.setCellValue(amDTO.getAddress());
-            }
-
-            //todo 将wb保存到oss
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            workbook.write(output);
-
-            byte[] buffer = output.toByteArray();
-            ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-            String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-            //todo 返回导入失败报表下载链接
-
-            msgResult.setData(downloadUrl);
-            msgResult.setResult(true);
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/ApplicationPrimaryController.java

@@ -1,2345 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.config.OSSConfig;
-import com.jpsoft.supervision.config.WechatConfig;
-import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.supervision.modules.base.dto.AttachmentDTO;
-import com.jpsoft.supervision.modules.base.entity.*;
-import com.jpsoft.supervision.modules.base.service.*;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.*;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
-import com.jpsoft.supervision.modules.sys.entity.User;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
-import com.jpsoft.supervision.modules.sys.service.UserRoleService;
-import com.jpsoft.supervision.modules.sys.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.List;
-
-@RestController
-@RequestMapping("/base/applicationPrimary")
-@Api(description = "applicationPrimary")
-public class ApplicationPrimaryController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApplicationPrimaryService applicationPrimaryService;
-    @Autowired
-    private StudentInfoService studentInfoService;
-    @Autowired
-    private PersonInfoService personInfoService;
-    @Autowired
-    private StudentFilesService studentFilesService;
-    @Autowired
-    private DataDictionaryService dataDictionaryService;
-    @Autowired
-    private ApprovalInfoService approvalInfoService;
-    @Autowired
-    private PersonStudentService personStudentService;
-    @Autowired
-    private SchoolInfoService schoolInfoService;
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private UserRoleService userRoleService;
-    @Autowired
-    private OfferInfoService offerInfoService;
-    @Autowired
-    private OSSConfig ossConfig;
-    @Autowired
-    private WechatConfig wechatConfig;
-    @Autowired
-    private ApportionDetailService apportionDetailService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<ApplicationPrimary> create(){
-        MessageResult<ApplicationPrimary> msgResult = new MessageResult<>();
-
-        ApplicationPrimary applicationPrimary = new ApplicationPrimary();
-
-        msgResult.setData(applicationPrimary);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<ApplicationPrimary> add(@RequestBody ApplicationPrimary applicationPrimary,@RequestAttribute String subject){
-        MessageResult<ApplicationPrimary> msgResult = new MessageResult<>();
-
-        try {
-            //applicationPrimary.setId(UUID.randomUUID().toString());
-            applicationPrimary.setDelFlag(false);
-            applicationPrimary.setCreateBy(subject);
-            applicationPrimary.setCreateTime(new Date());
-            
-            int affectCount = applicationPrimaryService.insert(applicationPrimary);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationPrimary);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<ApplicationPrimary> edit(@PathVariable("id") String id){
-        MessageResult<ApplicationPrimary> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-
-            if (applicationPrimary != null) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationPrimary);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<ApplicationPrimary> update(@RequestBody ApplicationPrimary applicationPrimary,@RequestAttribute String subject){
-        MessageResult<ApplicationPrimary> msgResult = new MessageResult<>();
-
-        try {
-            applicationPrimary.setUpdateBy(subject);
-            applicationPrimary.setUpdateTime(new Date());
-            
-            int affectCount = applicationPrimaryService.update(applicationPrimary);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(applicationPrimary);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-            applicationPrimary.setDelFlag(true);
-            applicationPrimary.setUpdateBy(subject);
-            applicationPrimary.setUpdateTime(new Date());
-
-            int affectCount = applicationPrimaryService.update(applicationPrimary);
-
-            //添加审批记录
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(applicationPrimary.getId());
-            approvalInfo.setOperation("后端删除");
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            approvalInfoService.insert(approvalInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-                applicationPrimary.setDelFlag(true);
-                applicationPrimary.setUpdateBy(subject);
-                applicationPrimary.setUpdateTime(new Date());
-
-                affectCount += applicationPrimaryService.update(applicationPrimary);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.school_id","asc"));
-        sortList.add(new Sort("a.type_","asc"));
-        sortList.add(new Sort("a.category_id","desc"));
-        sortList.add(new Sort("a.offer_code","asc"));
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(tabStatus)) {
-            searchParams.put("tabStatus",tabStatus);
-        }
-        if (StringUtils.isNotEmpty(type)) {
-            if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                searchParams.put("type", type);
-            }else{
-                searchParams.put("type", "C");
-                searchParams.put("categoryId", type);
-            }
-        }
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-        if (StringUtils.isNotEmpty(nameOrIdCard)) {
-            searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-        }
-
-        if (StringUtils.isNotEmpty(cardType)) {
-            searchParams.put("cardType",cardType);
-        }
-
-        searchParams.put("delFlag",delFlag);
-
-        if(StringUtils.isNotEmpty(schoolId)){
-            searchParams.put("code", "%" + schoolId + "%");
-        }else{
-            if (!userService.hasRole(subject,"SYSADMIN")) {
-                User user = userService.get(subject);
-                searchParams.put("code", "%" + user.getSchoolId() + "%");
-            }
-        }
-
-        if(StringUtils.isNotEmpty(isSend)){
-            searchParams.put("isSend", isSend);
-        }
-
-        if(StringUtils.isNotEmpty(offerId)){
-            searchParams.put("offerId", offerId);
-        }
-
-        //查询范围
-        //开始
-        if (StringUtils.isNotEmpty(startStatus)) {
-            searchParams.put("startStatus",startStatus);
-        }
-        //结束
-        if (StringUtils.isNotEmpty(endStatus)) {
-            searchParams.put("endStatus",endStatus);
-        }
-
-        if (StringUtils.isNotEmpty(categoryId)) {
-            searchParams.put("categoryId",categoryId);
-        }
-
-        //根据用户和角色查询
-        int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-        int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-        int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-        if(count1 > 0){
-            //管理员查全部
-        }else if(count2 > 0){
-            //领导查全部
-        }else if(count3 > 0){
-            //工作人员只能查网上初审10和现场初审20
-            List statusList = new ArrayList();
-            statusList.add("10");
-            statusList.add("20");
-            searchParams.put("orStatus",statusList);
-        }
-
-        Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-        for(ApplicationPrimaryDTO applicationPrimaryDTO : page.getResult()){
-            List<AttachmentDTO> attachmentDTOList = new ArrayList<>();
-            AttachmentDTO attachmentDTO = new AttachmentDTO();
-            DataDictionary dataDictionary = dataDictionaryService.findByParentIdAndValue(DataDictionary.STUDENT_RELATED_CERT_ID,"3");
-            attachmentDTO.setId(dataDictionary.getId());
-            attachmentDTO.setName(dataDictionary.getName());
-
-            List<String> studentFilesList = studentFilesService.findUrlByApplicationIdAndFileType(applicationPrimaryDTO.getApplicationId(),attachmentDTO.getId());
-            attachmentDTO.setFiles(studentFilesList);
-            attachmentDTOList.add(attachmentDTO);
-
-            applicationPrimaryDTO.setStudentCertificationFileList(attachmentDTOList);
-            applicationPrimaryDTO.setRelationshipName(dataDictionaryService.getName(applicationPrimaryDTO.getRelationship()));
-            applicationPrimaryDTO.setTypeName(dataDictionaryService.findNameByCatalogNameAndValue("报名类型",applicationPrimaryDTO.getType()));
-            applicationPrimaryDTO.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimaryDTO.getStatus()));
-            applicationPrimaryDTO.setCardType(dataDictionaryService.findNameByCatalogNameAndValue("证件类型",applicationPrimaryDTO.getCardType()));
-            applicationPrimaryDTO.setCategoryName(dataDictionaryService.getValue(applicationPrimaryDTO.getCategoryId()));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="审核分类数")
-    @RequestMapping(value = "statusCount",method = RequestMethod.POST)
-    public MessageResult<Map> statusCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        Integer sum = 0;
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("小学招生审核流程");
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("tabStatus",dataDictionary.getValue());
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                    searchParams.put("type", type);
-                }else{
-                    searchParams.put("type", "C");
-                    searchParams.put("categoryId", type);
-                }
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            if(StringUtils.isNotEmpty(isSend)){
-                searchParams.put("isSend", isSend);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(dataDictionary.getValue(),page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="根据学校查询数量")
-    @RequestMapping(value = "schoolCount",method = RequestMethod.POST)
-    public MessageResult<Map> schoolCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        List<Sort> sortList2 = new ArrayList<>();
-        sortList2.add(new Sort("parent_id","asc"));
-        sortList2.add(new Sort("code_","asc"));
-
-        Map<String,Object> searchParams2 = new HashMap<>();
-
-        Integer sum = 0;
-        if (!userService.hasRole(subject,"SYSADMIN")) {
-            User user = userService.get(subject);
-            searchParams2.put("code", "%" + user.getSchoolId() + "%");
-        }
-        searchParams2.put("type", "1");//查学校
-        Page<SchoolInfo> scPage = schoolInfoService.pageSearch(searchParams2,0,10000,false,sortList2);
-
-        for(SchoolInfo sc : scPage.getResult()){
-            Map<String,Object> searchParams = new HashMap<>();
-            schoolId = sc.getId();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                    searchParams.put("type", type);
-                }else{
-                    searchParams.put("type", "C");
-                    searchParams.put("categoryId", type);
-                }
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(sc.getId(),page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="根据报名类型查询数量")
-    @RequestMapping(value = "categoryCount",method = RequestMethod.POST)
-    public MessageResult<Map> categoryCount(
-            String status,
-            String cardType,
-            String type,
-            String nameOrIdCard,
-            String schoolId,
-            String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        List<Sort> sortList2 = new ArrayList<>();
-        sortList2.add(new Sort("parent_id","asc"));
-        sortList2.add(new Sort("code_","asc"));
-
-        Map<String,Object> searchParams2 = new HashMap<>();
-
-        Integer sum = 0;
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("C类生证明");
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            Map<String,Object> searchParams = new HashMap<>();
-            categoryId = dataDictionary.getId();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_","asc"));
-
-            if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                    searchParams.put("type", type);
-                }else{
-                    searchParams.put("type", "C");
-                    searchParams.put("categoryId", type);
-                }
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    User user = userService.get(subject);
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,1,10000,false,sortList);
-            map.put(categoryId,page.size());
-            sum += page.size();
-        }
-        map.put("all",sum);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取详情")
-    @GetMapping("datail/{id}")
-    public MessageResult<Map> datail(@PathVariable("id") String id){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-
-            if (applicationPrimary != null) {
-                //学生信息
-                StudentInfo studentInfo = studentInfoService.get(applicationPrimary.getStudentId());
-                map.put("studentName",studentInfo.getName());
-                map.put("studentCardType",dataDictionaryService.findNameByCatalogNameAndValue("证件类型",studentInfo.getCardType()));
-                map.put("studentIdCard",studentInfo.getIdCard());
-                String sexName = studentInfo.getSex() == 1 ? "男" : "女";
-                map.put("studentSex",sexName);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                map.put("studentBirthday",sdf.format(studentInfo.getBirthday()));
-                PersonStudent personStudent = personStudentService.findByPersonIdAndStudentId(applicationPrimary.getPersonId(),applicationPrimary.getStudentId());
-                if(personStudent != null) {
-                    DataDictionary dataDictionary = dataDictionaryService.get(personStudent.getRelationship());
-                    map.put("relationship",dataDictionary.getName());
-                }
-                map.put("studentFilesList",fileMap2(applicationPrimary.getId(),"学生相关证明"));
-
-                //申报人信息
-                PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
-                map.put("personPhone",personInfo.getPhone());
-                map.put("typeName",dataDictionaryService.findNameByCatalogNameAndValue("报名类型",applicationPrimary.getType()));
-                map.put("status",applicationPrimary.getStatus());
-                map.put("statusName",dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
-//                map.put("statusName","");正式居住房类型
-                map.put("address",studentInfo.getAddress());
-                SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
-                map.put("schoolName",schoolInfo.getName());
-//                map.put("statusName","");正式居住房所有人与学生关系
-//                map.put("statusName","");不动产合同号
-                map.put("personName",personInfo.getName());
-                map.put("personIdCard",personInfo.getIdCard());
-                map.put("personFilesList",fileMap1(applicationPrimary.getId(),applicationPrimary.getType()+"类生证明"));
-                SchoolInfo offSchoolInfo = schoolInfoService.get(applicationPrimary.getOfferId());
-                if(offSchoolInfo != null) {
-                    map.put("offerName",offSchoolInfo.getName());
-                }else{
-                    map.put("offerName","");
-                }
-
-                map.put("offerCode",applicationPrimary.getOfferCode());
-
-
-                //审核记录
-                List<ApprovalInfo> approvalInfoList = approvalInfoService.findByApplicationId(applicationPrimary.getId());
-                for(ApprovalInfo approvalInfo : approvalInfoList){
-                    User user = userService.get(approvalInfo.getCreateBy());
-                    if(user != null) {
-                        approvalInfo.setCreateBy(user.getRealName());
-                    }else {
-                        approvalInfo.setCreateBy(personInfo.getName());
-                    }
-
-                    if(StringUtils.isNotEmpty(approvalInfo.getFileUrl())) {
-                        approvalInfo.setFileUrlList(new ArrayList<>(Arrays.asList(approvalInfo.getFileUrl().split(","))));
-                    }
-                }
-                map.put("approvalInfoList",approvalInfoList);
-
-                msgResult.setResult(true);
-                msgResult.setData(map);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    private Map<String,Object> fileMap1(String applicationId,String catalogName){
-        Map<String,Object> map = new HashMap<>();
-
-        ApplicationPrimary applicationPrimary = applicationPrimaryService.get(applicationId);
-
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName(catalogName);
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            //A,B,C类证明附件查找,先判断字典类型ID与申请表的保存的类型相同
-            if(applicationPrimary.getCategoryId().equals(dataDictionary.getId())){
-            if(dataDictionary.getDataType().equals("2")) {
-                AttachmentDTO attachmentDTO = new AttachmentDTO();
-                attachmentDTO.setId(dataDictionary.getId());
-                attachmentDTO.setName(dataDictionary.getName());
-                attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionary.getId()));
-                map.put(dataDictionary.getSortNo().toString(), attachmentDTO);
-            }else{
-                Map<String,Object> mapEx = new HashMap<>();
-                List<DataDictionary> dataDictionaryListEx = dataDictionaryService.findByParentId(dataDictionary.getId());
-                for(DataDictionary dataDictionaryEx : dataDictionaryListEx) {
-                    AttachmentDTO attachmentDTO = new AttachmentDTO();
-                    attachmentDTO.setId(dataDictionaryEx.getId());
-                    attachmentDTO.setName(dataDictionaryEx.getName());
-                    attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionaryEx.getId()));
-                    mapEx.put(dataDictionaryEx.getSortNo().toString(), attachmentDTO);
-
-                    if(attachmentDTO.getFiles().size() != 0){
-                        map.put("id", dataDictionary.getName());
-                        map.put("value", mapEx);
-                    }
-                }
-                }
-            }
-        }
-
-        return map;
-    }
-
-    /**
-     * shuzhan
-     * 查找A,B,C类附件
-     * @param applicationId
-     * @param catalogName
-     * @return
-     */
-    private Map<String,Object> fileMap2(String applicationId,String catalogName){
-        Map<String,Object> map = new HashMap<>();
-
-        ApplicationPrimary applicationPrimary = applicationPrimaryService.get(applicationId);
-
-        List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName(catalogName);
-        for(DataDictionary dataDictionary : dataDictionaryList){
-            //A,B,C类证明附件查找,先判断字典类型ID与申请表的保存的类型相同
-//            if(applicationPrimary.getCategoryId().equals(dataDictionary.getId())){
-                if(dataDictionary.getDataType().equals("2")) {
-                    AttachmentDTO attachmentDTO = new AttachmentDTO();
-                    attachmentDTO.setId(dataDictionary.getId());
-                    attachmentDTO.setName(dataDictionary.getName());
-                    attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionary.getId()));
-                    map.put(dataDictionary.getSortNo().toString(), attachmentDTO);
-                }else{
-                    Map<String,Object> mapEx = new HashMap<>();
-                    List<DataDictionary> dataDictionaryListEx = dataDictionaryService.findByParentId(dataDictionary.getId());
-                    for(DataDictionary dataDictionaryEx : dataDictionaryListEx) {
-                        AttachmentDTO attachmentDTO = new AttachmentDTO();
-                        attachmentDTO.setId(dataDictionaryEx.getId());
-                        attachmentDTO.setName(dataDictionaryEx.getName());
-                        attachmentDTO.setFiles(studentFilesService.findUrlByApplicationIdAndFileType(applicationId, dataDictionaryEx.getId()));
-                        mapEx.put(dataDictionaryEx.getSortNo().toString(), attachmentDTO);
-
-                        if(attachmentDTO.getFiles().size() != 0){
-                            map.put("id", dataDictionary.getName());
-                            map.put("value", mapEx);
-                        }
-                    }
-//                }
-            }
-        }
-
-        return map;
-    }
-
-    @ApiOperation(value="退回")
-    @RequestMapping(value = "back",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> back(String id,String remark,String fileUrl,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：退回");
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl(fileUrl);
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-            if (affectCount > 0) {
-                applicationPrimary.setStatus("5");
-                applicationPrimary.setUpdateBy(subject);
-                applicationPrimary.setUpdateTime(new Date());
-                applicationPrimaryService.update(applicationPrimary);
-
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                String backDate = sdf.format(new Date());
-//                SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
-                String backRemark = remark;
-                PersonInfo pi = personInfoService.get(applicationPrimary.getPersonId());
-                String appId = wechatConfig.getAppId();
-                String appSecret = wechatConfig.getAppSecret();
-
-                boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                user.getUserName(),"申请入学信息已被退回,请尽快按退回意见修改提交,报名时间到7月12日晚上12点截止",
-                backRemark,backDate,pi.getOpenId(),
-                wechatConfig.getBackNoticeTemplateId(),wechatConfig.getTokenUrl(),appId,appSecret);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="给已退回的群发消息")
-    @RequestMapping(value = "backMessage",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> backMessage(String id,String name,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-        try {
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.create_time","desc"));
-
-            //状态为5
-            searchParams.put("status",5);
-            //searchParams.put("name","%舒展%");
-            String appId = wechatConfig.getAppId();
-            String appSecret = wechatConfig.getAppSecret();
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,0,1000,false,sortList);
-            int messageNum = 0;
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            String backDate = sdf.format(new Date());
-
-            for(ApplicationPrimaryDTO dto : page.getResult()){
-                Map<String,Object> searchParams2 = new HashMap<>();
-
-                List<Sort> sortList2 = new ArrayList<>();
-                sortList.add(new Sort("create_time","desc"));
-
-                searchParams.put("delFlag",false);
-                searchParams.put("applicationId",dto.getApplicationId());
-                searchParams.put("operation","%退回%");
-
-                Page<ApprovalInfo> page2 = approvalInfoService.pageSearch(searchParams,0,100,false,sortList2);
-
-                for(ApprovalInfo approvalInfo2 : page2.getResult()){
-                    if(approvalInfo2 == null){
-                        continue;
-                    }
-                    //SchoolInfo schoolInfo = schoolInfoService.get(dto.getSchoolId());
-                    String backRemark = approvalInfo2.getRemark();
-                    PersonInfo pi = personInfoService.get(dto.getPersonId());
-
-                    boolean messageResult2 = WechatMessageUtil.sendMessageTemplate(
-                            user.getUserName(),"申请入学信息已被退回,请尽快按退回意见修改提交,报名时间到7月12日晚上12点截止",
-                            backRemark,backDate,pi.getOpenId(),
-                            wechatConfig.getBackNoticeTemplateId(),
-                            wechatConfig.getTokenUrl(),
-                            appId,appSecret);
-
-                    messageNum ++ ;
-                    break;
-                }
-
-            }
-
-            System.out.println(messageNum);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-        return msgResult;
-    }
-
-    @ApiOperation(value="前进")
-    @RequestMapping(value = "fore",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> fore(String id,String remark,String fileUrl,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：通过");
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl(fileUrl);
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-
-
-            if (affectCount > 0) {
-                if("40".equals(applicationPrimary.getStatus())){
-                    //A类B类直接录取
-                    if("A".equals(applicationPrimary.getType()) || "B".equals(applicationPrimary.getType())){
-                        applicationPrimary.setStatus("70");
-                        applicationPrimary.setOfferId(applicationPrimary.getSchoolId());
-                    }else{
-                        applicationPrimary.setStatus("60");
-                    }
-                }else if("50".equals(applicationPrimary.getStatus())){
-                    //A类B类直接录取
-                    if("A".equals(applicationPrimary.getType()) || "B".equals(applicationPrimary.getType())){
-                        applicationPrimary.setStatus("70");
-                        applicationPrimary.setOfferId(applicationPrimary.getSchoolId());
-
-//                        //获取最大编号
-//                        int serialNum = offerInfoService.findMaxSerialNum(applicationPrimary.getSchoolId(),"1");
-//                        serialNum = serialNum+1;//最大编号加一
-//                        Calendar date = Calendar.getInstance();
-//                        String year = String.valueOf(date.get(Calendar.YEAR));
-//                        SchoolInfo si = schoolInfoService.get(applicationPrimary.getSchoolId());
-//                        //开发区+年份+学校编号2位+序号4位
-//                        String code = "KFQ" + year + si.getSchoolCode() + String.format("%04d", serialNum);
-//                        //保存录取信息表
-//                        OfferInfo off = new OfferInfo();
-//                        off.setId(UUID.randomUUID().toString());
-//
-//                        off.setApplicationId(applicationPrimary.getId());
-//                        off.setStudentId(applicationPrimary.getStudentId());
-//                        off.setEnrollmentType("1");//小学
-//                        off.setSchoolId(applicationPrimary.getSchoolId());
-//                        off.setSerialNum(serialNum);
-//
-//                        off.setCode(code);
-//                        off.setDelFlag(false);
-//                        off.setCreateBy(subject);
-//                        off.setCreateTime(new Date());
-//                        offerInfoService.insert(off);
-                    }else{
-                        applicationPrimary.setStatus(String.valueOf(Integer.parseInt(applicationPrimary.getStatus()) + 10));
-                    }
-                }else{
-                    applicationPrimary.setStatus(String.valueOf(Integer.parseInt(applicationPrimary.getStatus()) + 10));
-                }
-
-                applicationPrimary.setUpdateBy(subject);
-                applicationPrimary.setUpdateTime(new Date());
-                applicationPrimaryService.update(applicationPrimary);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="翻页")
-    @RequestMapping(value = "pageTurn",method = RequestMethod.POST)
-    public MessageResult<Map> pageTurn(String id,String type,String nameOrIdCard,String status,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","asc"));
-
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-        if (StringUtils.isNotEmpty(nameOrIdCard)) {
-            searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-        }
-
-        Map<String,Object> map = new HashMap<>();
-        Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,1,10000,false,sortList);
-        for(int i=0;i<page.size();i++){
-            ApplicationPrimaryDTO applicationPrimaryDTO = page.get(i);
-            if(applicationPrimaryDTO.getApplicationId().equals(id)){
-                if(i > 0) {
-                    map.put("pagePrevious",page.get(i - 1).getApplicationId());
-                }
-                if(i < page.size()-1) {
-                    map.put("pageNext",page.get(i + 1).getApplicationId());
-                }
-            }
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="派位页面的报名列表")
-    @RequestMapping(value = "pageListApportion",method = RequestMethod.POST)
-    public MessageResult<Map> pageListApportion(
-            String schoolId,String type,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-
-        Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-        for(ApplicationPrimaryDTO applicationPrimaryDTO : page.getResult()){
-            List<AttachmentDTO> attachmentDTOList = new ArrayList<>();
-            AttachmentDTO attachmentDTO = new AttachmentDTO();
-            DataDictionary dataDictionary = dataDictionaryService.findByParentIdAndValue(DataDictionary.STUDENT_RELATED_CERT_ID,"3");
-            attachmentDTO.setId(dataDictionary.getId());
-            attachmentDTO.setName(dataDictionary.getName());
-
-            List<String> studentFilesList = studentFilesService.findUrlByApplicationIdAndFileType(applicationPrimaryDTO.getApplicationId(),attachmentDTO.getId());
-            attachmentDTO.setFiles(studentFilesList);
-            attachmentDTOList.add(attachmentDTO);
-
-            applicationPrimaryDTO.setStudentCertificationFileList(attachmentDTOList);
-            applicationPrimaryDTO.setRelationshipName(dataDictionaryService.getName(applicationPrimaryDTO.getRelationship()));
-            applicationPrimaryDTO.setTypeName(dataDictionaryService.findNameByCatalogNameAndValue("报名类型",applicationPrimaryDTO.getType()));
-            applicationPrimaryDTO.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimaryDTO.getStatus()));
-            applicationPrimaryDTO.setCardType(dataDictionaryService.findNameByCatalogNameAndValue("证件类型",applicationPrimaryDTO.getCardType()));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value = "导出")
-    @PostMapping("exportXls")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "姓名", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "idCard", value = "身份证", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "phone", value = "手机号", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "parentId", value = "企业编号", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "subordinate", value = "是否查询下级单位", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position1", value = "一级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position2", value = "二级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position3", value = "三级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position4", value = "四级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "position5", value = "五级位置", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "faceBound", value = "是否同步", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "isUploadPhoto", value = "是否上传照片", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "popedom", value = "用户角色", required = false, paramType = "form", dataType = "String")
-    })
-    public MessageResult<String> exportXls(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject) {
-        MessageResult<String> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-
-
-        try {
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            HSSFSheet sheet = workbook.createSheet();
-            //表头
-            HSSFRow rowTitle = sheet.createRow(0);
-            HSSFCell cellTitle1 = rowTitle.createCell(0);
-            cellTitle1.setCellValue("序号");
-            HSSFCell cellTitle2 = rowTitle.createCell(1);
-            cellTitle2.setCellValue("报名类型");
-            HSSFCell cellTitle3 = rowTitle.createCell(2);
-            cellTitle3.setCellValue("报名学校");
-            HSSFCell cellTitle4 = rowTitle.createCell(3);
-            cellTitle4.setCellValue("学生姓名");
-            HSSFCell cellTitle5 = rowTitle.createCell(4);
-            cellTitle5.setCellValue("证件类型");
-            HSSFCell cellTitle6 = rowTitle.createCell(5);
-            cellTitle6.setCellValue("证件号码");
-            HSSFCell cellTitle7 = rowTitle.createCell(6);
-            cellTitle7.setCellValue("审核状态");
-            HSSFCell cellTitle8 = rowTitle.createCell(7);
-            cellTitle8.setCellValue("申请时间");
-            HSSFCell cellTitle9 = rowTitle.createCell(8);
-            cellTitle9.setCellValue("登记人关系");
-            HSSFCell cellTitle10 = rowTitle.createCell(9);
-            cellTitle10.setCellValue("登记人姓名");
-            HSSFCell cellTitle11 = rowTitle.createCell(10);
-            cellTitle11.setCellValue("登记人手机号码");
-            HSSFCell cellTitle12 = rowTitle.createCell(11);
-            cellTitle12.setCellValue("学生地址");
-            HSSFCell cellTitle13 = rowTitle.createCell(12);
-            cellTitle13.setCellValue("");
-            HSSFCell cellTitle14 = rowTitle.createCell(13);
-            cellTitle14.setCellValue("");
-            HSSFCell cellTitle15 = rowTitle.createCell(14);
-            cellTitle15.setCellValue("");
-            HSSFCell cellTitle16 = rowTitle.createCell(15);
-            cellTitle16.setCellValue("");
-            HSSFCell cellTitle17 = rowTitle.createCell(16);
-            cellTitle17.setCellValue("");
-
-//            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
-//            for(int i = 1; i < maxColumn; i++) {
-//                //int columnWidth = sheet.getColumnWidth(i) / 256;
-//                sheet.setColumnWidth(i, 12 * 256);
-//            }
-            //学校
-            sheet.setColumnWidth(2, 20 * 256);
-            //身份证
-            sheet.setColumnWidth(5, 24 * 256);
-            //报名时间
-            sheet.setColumnWidth(7, 24 * 256);
-            //登记人手机号
-            sheet.setColumnWidth(10, 15 * 256);
-            //地址
-            sheet.setColumnWidth(11, 50 * 256);
-
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.create_time","desc"));
-
-            if (StringUtils.isNotEmpty(tabStatus)) {
-                searchParams.put("tabStatus",tabStatus);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            //查询范围
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,0,100000,true,sortList);
-            List<DataDictionary> relationshipList = dataDictionaryService.findByCatalogName("学生关系");
-            List<DataDictionary> typeNameList = dataDictionaryService.findByCatalogName("报名类型");
-            List<DataDictionary> statusNameList = dataDictionaryService.findByCatalogName("小学招生审核流程");
-            List<DataDictionary> cardTypeList = dataDictionaryService.findByCatalogName("证件类型");
-
-            for (int i = 0; i < page.size(); i++) {
-                ApplicationPrimaryDTO apDTO = page.get(i);
-                String relationship = relationshipList.stream()
-                        .filter(e -> e.getId().equals(apDTO.getRelationship()))
-                        .findFirst().get().getName();
-                String typeName = typeNameList.stream()
-                        .filter(e -> e.getValue().equals(apDTO.getType()))
-                        .findFirst().get().getName();
-                String statusName = statusNameList.stream()
-                        .filter(e -> e.getValue().equals(apDTO.getStatus()))
-                        .findFirst().get().getName();
-                String cardTypeName = cardTypeList.stream()
-                        .filter(e -> e.getValue().equals(apDTO.getCardType()))
-                        .findFirst().get().getName();
-
-                HSSFRow rowContent = sheet.createRow(i + 1);
-                //"序号"
-                HSSFCell cellContent1 = rowContent.createCell(0);
-                cellContent1.setCellValue(i + 1);
-//                "报名类型"
-                HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(typeName);
-//                "报名学校"
-                HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(apDTO.getSchoolName());
-//                "学生姓名"
-                HSSFCell cellContent4 = rowContent.createCell(3);
-                cellContent4.setCellValue(apDTO.getName());
-//                "证件类型"
-                HSSFCell cellContent5 = rowContent.createCell(4);
-                cellContent5.setCellValue(cardTypeName);
-//                "证件号码"
-                HSSFCell cellContent6 = rowContent.createCell(5);
-                cellContent6.setCellValue(apDTO.getIdCard());
-//                "审核状态"
-                HSSFCell cellContent7 = rowContent.createCell(6);
-                cellContent7.setCellValue(statusName);
-//                "申请时间"
-                HSSFCell cellContent8 = rowContent.createCell(7);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                cellContent8.setCellValue(sdf.format(apDTO.getCreateTime()));
-                //"登记人关系"
-                HSSFCell cellContent9 = rowContent.createCell(8);
-                cellContent9.setCellValue(relationship);
-                if(StringUtils.isNotEmpty(apDTO.getPersonId())){
-                    //"登记人姓名"
-                    HSSFCell cellContent10 = rowContent.createCell(9);
-                    PersonInfo pi =personInfoService.get(apDTO.getPersonId());
-                    cellContent10.setCellValue(pi.getName());
-
-                    //"登记人手机号码"
-                    HSSFCell cellContent11 = rowContent.createCell(10);
-                    cellContent11.setCellValue(pi.getPhone());
-                }
-
-                //"学生地址"
-                HSSFCell cellContent12 = rowContent.createCell(11);
-                cellContent12.setCellValue(apDTO.getAddress());
-
-                List<Sort> sortList2 = new ArrayList<>();
-                sortList2.add(new Sort("create_time","asc"));
-                Map<String,Object> searchParams2 = new HashMap<>();
-                searchParams2.put("applicationId",apDTO.getApplicationId());
-                List<String> operationList = new ArrayList<String>();
-                operationList.add("%待网上初审：通过%");
-                operationList.add("%待现场复审：通过%");
-                searchParams2.put("operationList",operationList);
-                searchParams2.put("delFlag",false);
-                Page<ApprovalInfo> aiPage = approvalInfoService.pageSearch(searchParams2,0,1000,false,sortList2);
-                List<ApprovalInfo> apList = aiPage.getResult();
-                for(int b =0;b<apList.size();b++){
-                    HSSFCell cellContent = rowContent.createCell(b+12);
-                    ApprovalInfo ap = apList.get(b);
-                    cellContent.setCellValue(ap.getRemark());
-                }
-            }
-
-            //todo 将wb保存到oss
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            workbook.write(output);
-
-            byte[] buffer = output.toByteArray();
-            ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-            String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-            //todo 返回导入失败报表下载链接
-
-            msgResult.setData(downloadUrl);
-            msgResult.setResult(true);
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="发送微信消息")
-    @RequestMapping(value = "sendWechatMessage",method = RequestMethod.POST)
-    public MessageResult<Integer> sendWechatMessage(
-            String idList,
-            String message,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Integer> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-        try {
-            String appId = wechatConfig.getAppId();
-            String appSecret = wechatConfig.getAppSecret();
-            String []ids = idList.split(",");
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            String sendDate = sdf.format(new Date());
-            int messageNum = 0;
-            for(String id: ids){
-                ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-                PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
-                boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                            user.getUserName(),message,
-                            "",sendDate,personInfo.getOpenId(),
-                            wechatConfig.getBackNoticeTemplateId(),
-                            wechatConfig.getTokenUrl(),
-                            appId,appSecret);
-                if(messageResult){
-                    applicationPrimary.setIsSend(true);
-                    applicationPrimary.setSendTime(new Date());
-                    applicationPrimaryService.update(applicationPrimary);
-                    messageNum ++ ;
-                }
-            }
-
-            msgResult.setResult(true);
-            msgResult.setData(messageNum);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-        return msgResult;
-    }
-
-    @ApiOperation(value="调剂")
-    @RequestMapping(value = "tjPrimary",method = RequestMethod.POST)
-    public MessageResult<Integer> tjPrimary(
-            String id,
-            String schoolId,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<Integer> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-        int count = 0;
-        try {
-            ApplicationPrimary ap = applicationPrimaryService.get(id);
-            ap.setOfferId(schoolId);
-            ap.setStatus("70");
-            ap.setUpdateBy(subject);
-            ap.setUpdateTime(new Date());
-            count = applicationPrimaryService.update(ap);
-
-            msgResult.setResult(true);
-            msgResult.setData(count);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-        return msgResult;
-    }
-
-    @ApiOperation(value="修改状态")
-    @RequestMapping(value = "updateStatus",method = RequestMethod.POST)
-    public MessageResult<ApprovalInfo> updateStatus(String id,String remark,String status,String typeValue,@RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            ApplicationPrimary applicationPrimary = applicationPrimaryService.get(id);
-            User user = userService.get(subject);
-
-            ApprovalInfo approvalInfo = new ApprovalInfo();
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setApplicationId(id);
-            if("90".equals(status)) {
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
-            }else{
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：" + typeValue);
-            }
-
-            approvalInfo.setRemark(remark);
-            approvalInfo.setFileUrl("");
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-
-
-            if (affectCount > 0) {
-                applicationPrimary.setStatus(status);
-                applicationPrimary.setUpdateBy(subject);
-                applicationPrimary.setUpdateTime(new Date());
-
-                if("60".equals(status) && "退回".equals(typeValue)){
-                    applicationPrimary.setOfferId("");
-                    List<ApportionDetail> adList = apportionDetailService.findByStudentId(applicationPrimary.getStudentId());
-                    for(ApportionDetail ad : adList){
-                        ad.setDelFlag(true);
-                        apportionDetailService.update(ad);
-                    }
-                }else if("90".equals(status)){
-                    //获取最大编号
-                    int serialNum = offerInfoService.findMaxSerialNum(applicationPrimary.getSchoolId(),"1");
-                    serialNum = serialNum+1;//最大编号加一
-                    Calendar date = Calendar.getInstance();
-                    String year = String.valueOf(date.get(Calendar.YEAR));
-                    SchoolInfo si = schoolInfoService.get(applicationPrimary.getOfferId());
-                    //开发区+年份+学校编号2位+序号4位
-                    String code = "KFQ" + year + si.getSchoolCode() + String.format("%04d", serialNum);
-                    //保存录取信息表
-                    OfferInfo off = new OfferInfo();
-                    off.setId(UUID.randomUUID().toString());
-                    off.setApplicationId(applicationPrimary.getId());
-                    off.setStudentId(applicationPrimary.getStudentId());
-                    off.setEnrollmentType("1");//小学
-                    off.setSchoolId(applicationPrimary.getOfferId());
-                    off.setSerialNum(serialNum);
-
-                    applicationPrimary.setOfferCode(code);
-                    SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getOfferId());
-                    PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
-                    StudentInfo studentInfo = studentInfoService.get(applicationPrimary.getStudentId());
-                    String bdUrl = toPressText(code,personInfo.getName(),studentInfo.getName(), schoolInfo.getName());
-                    String uploadUrl = uploadImg(bdUrl);
-                    if(StringUtils.isNotEmpty(uploadUrl)){
-                        applicationPrimary.setOfferImg(uploadUrl);
-                        off.setCode(code);
-                        off.setDelFlag(false);
-                        off.setCreateBy(subject);
-                        off.setCreateTime(new Date());
-                        offerInfoService.insert(off);
-                        new Thread(() -> {
-                            try {
-                                String content = "尊敬的家长您好，您的报名申请已通过，请前往“荆州开发区网上入学”--报名查询，下载电子版入学通知书。";
-                                sendMessage(content, applicationPrimary.getPersonId(),user.getRealName());
-                            } catch (Exception ex) {
-                                ex.printStackTrace();
-                            }
-                        }).start();
-                    }else{
-                        applicationPrimary.setStatus("80");
-                    }
-                }
-                applicationPrimaryService.update(applicationPrimary);
-
-
-//                String uploadPath = Resource.class.getResource("/").getPath() +"uploadImg";
-//                delAllFile(uploadPath);
-
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="全部通过")
-    @RequestMapping(value = "allNext",method = RequestMethod.POST)
-    public MessageResult<Map> allNext(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="nextStatus",defaultValue="") String nextStatus,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-        User user = userService.get(subject);
-
-        try {
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.create_time", "desc"));
-
-            if (StringUtils.isNotEmpty(tabStatus)) {
-                searchParams.put("tabStatus", tabStatus);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type", type);
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status", status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard", "%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType", cardType);
-            }
-
-            searchParams.put("delFlag", delFlag);
-
-            if (StringUtils.isNotEmpty(schoolId)) {
-                searchParams.put("code", "%" + schoolId + "%");
-            } else {
-                if (!userService.hasRole(subject, "SYSADMIN")) {
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            if (StringUtils.isNotEmpty(isSend)) {
-                searchParams.put("isSend", isSend);
-            }
-
-            if (StringUtils.isNotEmpty(offerId)) {
-                searchParams.put("offerId", offerId);
-            }
-
-            //查询范围
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus", startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus", endStatus);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId", categoryId);
-            }
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject, "SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject, "XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject, "XFGZRY");
-
-            if (count1 > 0) {
-                //管理员查全部
-            } else if (count2 > 0) {
-                //领导查全部
-            } else if (count3 > 0) {
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus", statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams, 0, 100000, false, sortList);
-            for (ApplicationPrimaryDTO applicationPrimaryDTO : page.getResult()) {
-
-                ApplicationPrimary applicationPrimary = applicationPrimaryService.get(applicationPrimaryDTO.getApplicationId());
-
-                if ("40".equals(applicationPrimary.getStatus())) {
-                    //A类B类直接录取
-                    if ("A".equals(applicationPrimary.getType()) || "B".equals(applicationPrimary.getType())) {
-                        applicationPrimary.setStatus("70");
-                        applicationPrimary.setOfferId(applicationPrimary.getSchoolId());
-                    } else {
-                        applicationPrimary.setStatus(nextStatus);
-                    }
-                } else if ("50".equals(applicationPrimary.getStatus())) {
-                    //A类B类直接录取
-                    if ("A".equals(applicationPrimary.getType()) || "B".equals(applicationPrimary.getType())) {
-                        applicationPrimary.setStatus("70");
-                        applicationPrimary.setOfferId(applicationPrimary.getSchoolId());
-                    } else {
-                        applicationPrimary.setStatus(nextStatus);
-                    }
-                } else if ("70".equals(applicationPrimary.getStatus())) {
-                    //微信消息推送 发送预录取通知
-                    applicationPrimary.setStatus(nextStatus);
-
-//                    new Thread(() -> {
-////                        try {
-////                            String content = "尊敬的家长您好，您的报名申请已通过。关注“荆州开发区网上入学”--报名查询，我们将于近期推送电子版入学通知书。";
-////                            sendMessage(content,applicationPrimary.getPersonId(),user.getRealName());
-////                        } catch (Exception ex) {
-////                            ex.printStackTrace();
-////                        }
-////                    }).start();
-                } else if ("80".equals(applicationPrimary.getStatus())) {
-                    //微信消息推送 发送完成录取通知
-                    applicationPrimary.setStatus(nextStatus);
-
-                    int serialNum = offerInfoService.findMaxSerialNum(applicationPrimary.getSchoolId(), "1");
-                    serialNum = serialNum + 1;//最大编号加一
-                    Calendar date = Calendar.getInstance();
-                    String year = String.valueOf(date.get(Calendar.YEAR));
-                    SchoolInfo si = schoolInfoService.get(applicationPrimary.getOfferId());
-                    //开发区+年份+学校编号2位+序号4位
-                    String code = "KFQ" + year + si.getSchoolCode() + String.format("%04d", serialNum);
-                    //保存录取信息表
-                    OfferInfo off = new OfferInfo();
-                    off.setId(UUID.randomUUID().toString());
-
-                    off.setApplicationId(applicationPrimary.getId());
-                    off.setStudentId(applicationPrimary.getStudentId());
-                    off.setEnrollmentType("1");//小学
-                    off.setSchoolId(applicationPrimary.getSchoolId());
-                    off.setSerialNum(serialNum);
-                    off.setCode(code);
-                    off.setDelFlag(false);
-                    off.setCreateBy(subject);
-                    off.setCreateTime(new Date());
-
-                    applicationPrimary.setOfferCode(code);
-                    SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getOfferId());
-                    PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
-                    StudentInfo studentInfo = studentInfoService.get(applicationPrimary.getStudentId());
-                    String bdUrl = toPressText(code, personInfo.getName(), studentInfo.getName(), schoolInfo.getName());
-                    String uploadUrl = uploadImg(bdUrl);
-
-                    if(StringUtils.isNotEmpty(uploadUrl)){
-                        off.setCode(code);
-                        off.setDelFlag(false);
-                        off.setCreateBy(subject);
-                        off.setCreateTime(new Date());
-                        offerInfoService.insert(off);
-
-                        applicationPrimary.setOfferImg(uploadUrl);
-                        new Thread(() -> {
-                            try {
-                                String content = "尊敬的家长您好，您的报名申请已通过，请前往“荆州开发区网上入学”--报名查询，下载电子版入学通知书。";
-                                sendMessage(content, applicationPrimary.getPersonId(),user.getRealName());
-                            } catch (Exception ex) {
-                                ex.printStackTrace();
-                            }
-                        }).start();
-                    }else{
-                        applicationPrimary.setStatus("80");
-                    }
-
-                } else {
-                    applicationPrimary.setStatus(nextStatus);
-                }
-                applicationPrimary.setUpdateBy(subject);
-                applicationPrimary.setUpdateTime(new Date());
-
-                ApprovalInfo approvalInfo = new ApprovalInfo();
-                approvalInfo.setId(UUID.randomUUID().toString());
-                approvalInfo.setApplicationId(applicationPrimary.getId());
-                if("80".equals(status)) {
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
-                }else{
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", applicationPrimary.getStatus()) + "：通过审核");
-                }
-                approvalInfo.setRemark("通过审核");
-                approvalInfo.setFileUrl("");
-                approvalInfo.setDelFlag(false);
-                approvalInfo.setCreateBy(subject);
-                approvalInfo.setCreateTime(new Date());
-
-                int affectCount = approvalInfoService.insert(approvalInfo);
-
-                applicationPrimaryService.update(applicationPrimary);
-            }
-
-            //完成后删除文件夹
-//            String uploadPath = Resource.class.getResource("/").getPath() + "uploadImg";
-//            delAllFile(uploadPath);
-
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
-        return msgResult;
-    }
-
-    public static void main(String[] args) {
-        String in = "static/primary_tzs.jpg";
-        String out = "uploadImg/primary_tzs_" + "11111" + ".jpg";
-        String inImg = Resource.class.getResource("/").getPath() + in;
-        String outImg = Resource.class.getResource("/").getPath() + out;
-        try{
-            BufferedImage im =ImageIO.read(new FileInputStream(inImg));
-            int mothh = DateUtil.thisMonth() +1;
-            Graphics g = im.getGraphics();
-            g.setColor(new Color(0,0,0));
-            //g.setColor(Color.BLUE);
-            Font font = new Font("宋体",Font.PLAIN,40);  //设置字体
-            g.setFont(font);
-            g.drawString("5555555",1000,400);
-            g.drawString("舒爸爸",410,600);
-            g.drawString("舒展",830,680);
-            g.drawString("8",660,940);
-            g.drawString("27",730,940);
-            g.drawString("8",890,940);
-            g.drawString("27",970,940);
-            g.drawString("湖北省荆州市沙市区小学",480,1015);
-            g.drawString(mothh+"",1000,1590);
-            g.drawString(DateUtil.thisDayOfMonth()+"",1060,1590);
-            g.dispose();
-            ImageIO.write(im,"jpg",new File(outImg));
-        }catch (IOException e){
-            e.printStackTrace();
-        }
-    }
-
-    @ApiOperation(value="全部通过")
-    @RequestMapping(value = "toPressText",method = RequestMethod.POST)
-    public String toPressText(String offerCode,String personName,String userName,String schoolName){
-        String in = "static/primary_tzs.jpg";
-        String out = "uploadImg/primary_tzs_" + offerCode + ".jpg";
-        String inImg = Resource.class.getResource("/").getPath() + in;
-        String outImg = Resource.class.getResource("/").getPath() + out;
-
-        try{
-            BufferedImage im =ImageIO.read(new FileInputStream(inImg));
-            int mothh = DateUtil.thisMonth() +1;
-            Graphics g = im.getGraphics();
-            g.setColor(new Color(0,0,0));
-            Font font = new Font("宋体",Font.BOLD,40);  //设置字体
-            g.setFont(font);
-            Random ran = new Random();  // 随机位置
-            g.drawString(offerCode,1000,400);
-            g.drawString(personName,410,600);
-            g.drawString(userName,830,680);
-            g.drawString("8",660,940);
-            g.drawString("27",730,940);
-            g.drawString("8",890,940);
-            g.drawString("27",970,940);
-            g.drawString(schoolName,480,1015);
-            g.drawString(mothh+"",1000,1590);
-            g.drawString(DateUtil.thisDayOfMonth()+"",1060,1590);
-            g.dispose();
-            ImageIO.write(im,"jpg",new File(outImg));
-        }catch (IOException e){
-            e.printStackTrace();
-        }
-        return outImg;
-    }
-
-    public void pressText(String pressText, String targetImg,String outImg, String fontName, int fontStyle, Color color, int x, int y){
-        try{
-            BufferedImage im =ImageIO.read(new FileInputStream(outImg));
-            int iw = im.getWidth();
-            int ih = im.getHeight();
-            Graphics g = im.getGraphics();
-            g.setColor(color);
-            //g.setColor(Color.BLUE);
-            Font font = new Font("宋体",Font.PLAIN,40);  //设置字体
-            g.setFont(font);
-            String str = "12345";
-            //int x = iw/2;
-            //int y = ih/2;
-            Random ran = new Random();  // 随机位置
-            g.drawString(str,x,y);
-            g.dispose();
-            ImageIO.write(im,"jpg",new File(outImg));
-        }catch (IOException e){
-            e.printStackTrace();
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-//        try{
-//            File _file = new File(targetImg);
-//            Image src = ImageIO.read(_file);
-//            int weidth = src.getWidth(null);
-//            int height = src.getHeight(null);
-//            BufferedImage image = new BufferedImage(weidth,height,BufferedImage.TYPE_INT_RGB);
-//            Graphics g = image.createGraphics();
-//            g.drawImage(src,0,0,weidth,height,null);
-//            g.setColor(color);
-//            g.setFont(new Font(fontName,fontStyle,fontSize));
-//            g.drawString(pressText,x,y);
-//            g.dispose();
-//            FileOutputStream out = new FileOutputStream(targetImg);
-//            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-//            encoder.encode(image);
-//            out.close();
-//        } catch (java.io.IOException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-    public String uploadImg(String imgUrl){
-        String returnUrl = "";
-        try {
-            File jpgFile = new File(imgUrl);
-            InputStream input = new FileInputStream(jpgFile);
-            returnUrl = OSSUtil.upload(ossConfig, "/tzs", jpgFile.getName(), input);
-            input.close();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
-        return returnUrl;
-    }
-
-    public boolean sendMessage(String content,String personId,String adminName){
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String backDate = sdf.format(new Date());
-//                SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
-        String backRemark = "";
-        PersonInfo pi = personInfoService.get(personId);
-        String appId = wechatConfig.getAppId();
-        String appSecret = wechatConfig.getAppSecret();
-        boolean messageResult = WechatMessageUtil.sendMessageTemplate(
-                adminName,content,
-                backRemark,backDate,pi.getOpenId(),
-                wechatConfig.getBackNoticeTemplateId(),wechatConfig.getTokenUrl(),appId,appSecret);
-        return messageResult;
-    }
-
-    public static void delAllFile(String path) {
-        File file = new File(path);
-        if (!file.exists()) {
-            return;
-        }
-        if (!file.isDirectory()) {
-            return;
-        }
-        String[] tempList = file.list();
-        if (tempList == null) {
-            return;
-        }
-        File temp;
-        for (String aTempList : tempList) {
-            if (path.endsWith(File.separator)) {
-                temp = new File(path + aTempList);
-            } else {
-                temp = new File(path + File.separator + aTempList);
-            }
-            if (temp.isFile()) {
-                temp.delete();
-            }
-            if (temp.isDirectory()) {
-                delAllFile(path + "/" + aTempList);// 先删除文件夹里面的文件
-            }
-        }
-    }
-
-
-    @ApiOperation(value="修改新类型")
-    @PostMapping("changeNewType")
-    public MessageResult<Integer> changeNewType(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("type", "C");
-            searchParams.put("delFlag", false);
-            Page<ApplicationPrimary> page = applicationPrimaryService.pageSearch(searchParams,0,100000,false,sortList);
-
-            for (ApplicationPrimary ap : page.getResult()) {
-                List<ApprovalInfo> aiList = approvalInfoService.findByApplicationIdAndOperation(ap.getId(),"%C%");
-                if(aiList.size() > 0){
-                    ApprovalInfo ai = aiList.get(0);
-                    ap.setNewType(ai.getRemark());
-                    applicationPrimaryService.update(ap);
-                }
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("操作失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value = "导入其他职工")
-    @PostMapping("importCheckXls")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "uploadFile", value = "上传文件", required = true, paramType = "form", dataType = "__file")
-    })
-    public MessageResult<String> importOtherXls(
-            @RequestParam(value = "schoolId", defaultValue = "2a161029-324a-4ef5-8062-4cf63339bcdc") String schoolId,
-                                    MultipartFile uploadFile,@RequestAttribute String subject) {
-        User user = userService.get(subject);
-
-        MessageResult<String> msgResult = new MessageResult<>();
-        try {
-            POIUtils poiUtils = new POIUtils(uploadFile.getInputStream());
-            int sheetIndex = 0;
-            Sheet sheet1 = poiUtils.getSheetAt(sheetIndex);
-
-            int affectCount = 0;
-            int failCount = 0;
-            int validateColIndex = 5;
-
-            for (int rowIndex = 1; rowIndex <= sheet1.getLastRowNum(); rowIndex++) {
-                try {
-                    String name = (String) poiUtils.getCellValue(sheetIndex, rowIndex, 1).toString().replace(" ", "");
-                    String idCard = (String) poiUtils.getCellValue(sheetIndex, rowIndex, 2).toString().replace(" ", "");
-                    String newCate = (String) poiUtils.getCellValue(sheetIndex, rowIndex, 3).toString().replace(" ", "");
-
-                    ApplicationPrimary applicationPrimary = applicationPrimaryService.findByStudentNameAndIdCard(name,idCard,schoolId);
-
-                    if(applicationPrimary == null){
-                        applicationPrimary = new ApplicationPrimary();
-                        applicationPrimary.setId(idCard);
-                        applicationPrimary.setCreateBy(name);
-                        applicationPrimary.setOfferId(idCard);
-                        applicationPrimary.setNewType(newCate);
-                        applicationPrimaryService.insert(applicationPrimary);
-                    }else {
-                        applicationPrimary.setNewType(newCate);
-                        applicationPrimary.setUpdateBy(subject);
-                        applicationPrimary.setUpdateTime(new Date());
-                        applicationPrimaryService.update(applicationPrimary);
-                    }
-
-                } catch (Exception innerEx) {
-                    failCount++;
-                    sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue(innerEx.getMessage());
-                    logger.error(innerEx.getMessage(), innerEx);
-                }
-            }
-
-            if (failCount > 0) {
-                //有导入失败的记录
-                msgResult.setResult(false);
-                msgResult.setMessage("数据成功导入" + affectCount + "条,有" + failCount + "条数据未导入成功，错误原因请查看报表。");
-
-                //todo 只保留错误数据的sheet
-                Workbook wb = poiUtils.exportErrorXls(sheetIndex, validateColIndex, 10000);
-
-                //todo 将wb保存到oss
-                ByteArrayOutputStream output = new ByteArrayOutputStream();
-                wb.write(output);
-
-                byte[] buffer = output.toByteArray();
-                ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-                String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-                //todo 返回导入失败报表下载链接
-                msgResult.setData(downloadUrl);
-            } else {
-                msgResult.setResult(true);
-                msgResult.setMessage("数据成功导入" + affectCount + "条");
-            }
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value = "导出录取信息")
-    @PostMapping("exportOverXls")
-    public MessageResult<String> exportOverXls(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
-            @RequestParam(value="isSend",defaultValue="") String isSend,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestAttribute String subject) {
-        MessageResult<String> msgResult = new MessageResult<>();
-        User user = userService.get(subject);
-
-
-        try {
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            HSSFSheet sheet = workbook.createSheet();
-            //表头
-            HSSFRow rowTitle = sheet.createRow(0);
-            HSSFCell cellTitle1 = rowTitle.createCell(0);
-            cellTitle1.setCellValue("序号");
-            HSSFCell cellTitle2 = rowTitle.createCell(1);
-            cellTitle2.setCellValue("录取学校");
-            HSSFCell cellTitle3 = rowTitle.createCell(2);
-            cellTitle3.setCellValue("录取编号");
-            HSSFCell cellTitle4 = rowTitle.createCell(3);
-            cellTitle4.setCellValue("报名类型");
-            HSSFCell cellTitle5 = rowTitle.createCell(4);
-            cellTitle5.setCellValue("学生姓名");
-            HSSFCell cellTitle6 = rowTitle.createCell(5);
-            cellTitle6.setCellValue("证件号码");
-            HSSFCell cellTitle7 = rowTitle.createCell(6);
-            cellTitle7.setCellValue("申请时间");
-            HSSFCell cellTitle8 = rowTitle.createCell(7);
-            cellTitle8.setCellValue("登记人姓名");
-            HSSFCell cellTitle9 = rowTitle.createCell(8);
-            cellTitle9.setCellValue("联系电话");
-            HSSFCell cellTitle10 = rowTitle.createCell(9);
-            cellTitle10.setCellValue("学生地址");
-
-//            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
-//            for(int i = 1; i < maxColumn; i++) {
-//                //int columnWidth = sheet.getColumnWidth(i) / 256;
-//                sheet.setColumnWidth(i, 12 * 256);
-//            }
-
-            sheet.setColumnWidth(1, 20 * 256);
-            sheet.setColumnWidth(2, 20 * 256);
-            sheet.setColumnWidth(3, 10 * 256);
-            sheet.setColumnWidth(4, 15 * 256);
-            sheet.setColumnWidth(5, 25 * 256);
-            sheet.setColumnWidth(6, 20 * 256);
-            sheet.setColumnWidth(7, 15 * 256);
-            sheet.setColumnWidth(8, 20 * 256);
-            sheet.setColumnWidth(9, 40 * 256);
-
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.school_id","asc"));
-            sortList.add(new Sort("a.type_","asc"));
-            sortList.add(new Sort("a.category_id","desc"));
-            sortList.add(new Sort("a.offer_code","asc"));
-            sortList.add(new Sort("a.create_time","desc"));
-
-            if (StringUtils.isNotEmpty(tabStatus)) {
-                searchParams.put("tabStatus",tabStatus);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
-                    searchParams.put("type", type);
-                }else{
-                    searchParams.put("type", "C");
-                    searchParams.put("categoryId", type);
-                }
-            }
-            if (StringUtils.isNotEmpty(status)) {
-                searchParams.put("status",status);
-            }
-            if (StringUtils.isNotEmpty(nameOrIdCard)) {
-                searchParams.put("nameOrIdCard","%" + nameOrIdCard + "%");
-            }
-
-            if (StringUtils.isNotEmpty(cardType)) {
-                searchParams.put("cardType",cardType);
-            }
-
-            searchParams.put("delFlag",delFlag);
-
-            if(StringUtils.isNotEmpty(schoolId)){
-                searchParams.put("code", "%" + schoolId + "%");
-            }else{
-                if (!userService.hasRole(subject,"SYSADMIN")) {
-                    searchParams.put("code", "%" + user.getSchoolId() + "%");
-                }
-            }
-
-            if(StringUtils.isNotEmpty(isSend)){
-                searchParams.put("isSend", isSend);
-            }
-
-            if(StringUtils.isNotEmpty(offerId)){
-                searchParams.put("offerId", offerId);
-            }
-
-            //查询范围
-            //开始
-            if (StringUtils.isNotEmpty(startStatus)) {
-                searchParams.put("startStatus",startStatus);
-            }
-            //结束
-            if (StringUtils.isNotEmpty(endStatus)) {
-                searchParams.put("endStatus",endStatus);
-            }
-
-            if (StringUtils.isNotEmpty(categoryId)) {
-                searchParams.put("categoryId",categoryId);
-            }
-
-            //根据用户和角色查询
-            int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-            int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-            int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-            if(count1 > 0){
-                //管理员查全部
-            }else if(count2 > 0){
-                //领导查全部
-            }else if(count3 > 0){
-                //工作人员只能查网上初审10和现场初审20
-                List statusList = new ArrayList();
-                statusList.add("10");
-                statusList.add("20");
-                searchParams.put("orStatus",statusList);
-            }
-
-            Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,0,10000000,false,sortList);
-            for (int i = 0; i < page.size(); i++) {
-                ApplicationPrimaryDTO apDTO = page.get(i);
-                HSSFRow rowContent = sheet.createRow(i + 1);
-                //"序号"
-                HSSFCell cellContent1 = rowContent.createCell(0);
-                cellContent1.setCellValue(i + 1);
-//                "录取学校"
-                HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(apDTO.getOfferName());
-//                "录取编号"
-                HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(apDTO.getOfferCode());
-//                "报名类型"
-                HSSFCell cellContent4 = rowContent.createCell(3);
-                String typeName = "";
-                if("C".equals(apDTO.getType())){
-                    typeName = apDTO.getType() + dataDictionaryService.getValue(apDTO.getCategoryId());
-                }else{
-                    typeName = apDTO.getType();
-                }
-                cellContent4.setCellValue(typeName);
-//                "学生姓名"
-                HSSFCell cellContent5 = rowContent.createCell(4);
-                cellContent5.setCellValue(apDTO.getName());
-//                "证件号码"
-                HSSFCell cellContent6 = rowContent.createCell(5);
-                cellContent6.setCellValue(apDTO.getIdCard());
-//                "申请时间"
-                HSSFCell cellContent7 = rowContent.createCell(6);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                cellContent7.setCellValue(sdf.format(apDTO.getCreateTime()));
-                //"登记人姓名"
-                HSSFCell cellContent8 = rowContent.createCell(7);
-                cellContent8.setCellValue(apDTO.getPersonName());
-                //联系电话
-                HSSFCell cellContent9 = rowContent.createCell(8);
-                cellContent9.setCellValue(apDTO.getPersonPhone());
-                //"学生地址"
-                HSSFCell cellContent10 = rowContent.createCell(9);
-                cellContent10.setCellValue(apDTO.getAddress());
-            }
-
-            //todo 将wb保存到oss
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            workbook.write(output);
-
-            byte[] buffer = output.toByteArray();
-            ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-            String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-            //todo 返回导入失败报表下载链接
-
-            msgResult.setData(downloadUrl);
-            msgResult.setResult(true);
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/ApportionController.java

@@ -1,836 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.supervision.modules.base.entity.*;
-import com.jpsoft.supervision.modules.base.service.*;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
-import com.jpsoft.supervision.modules.sys.entity.User;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
-import com.jpsoft.supervision.modules.sys.service.UserRoleService;
-import com.jpsoft.supervision.modules.sys.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/apportion")
-@Api(description = "apportion")
-public class ApportionController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApportionService apportionService;
-    @Autowired
-    private ApportionDetailService apportionDetailService;
-    @Autowired
-    private SchoolInfoService schoolInfoService;
-    @Autowired
-    private DataDictionaryService dataDictionaryService;
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private ApplicationPrimaryService applicationPrimaryService;
-    @Autowired
-    private ApplicationMiddleService applicationMiddleService;
-    @Autowired
-    private UserRoleService userRoleService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<Apportion> create(){
-        MessageResult<Apportion> msgResult = new MessageResult<>();
-
-        Apportion apportion = new Apportion();
-
-        msgResult.setData(apportion);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<Apportion> add(@RequestBody Apportion apportion,@RequestAttribute String subject){
-        MessageResult<Apportion> msgResult = new MessageResult<>();
-
-        try {
-            apportion.setId(UUID.randomUUID().toString());
-            apportion.setDelFlag(false);
-            apportion.setCreateBy(subject);
-            apportion.setCreateTime(new Date());
-            
-            int affectCount = apportionService.insert(apportion);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(apportion);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<Apportion> edit(@PathVariable("id") String id){
-        MessageResult<Apportion> msgResult = new MessageResult<>();
-
-        try {
-            Apportion apportion = apportionService.get(id);
-
-            if (apportion != null) {
-                msgResult.setResult(true);
-                msgResult.setData(apportion);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<Apportion> update(@RequestBody Apportion apportion,@RequestAttribute String subject){
-        MessageResult<Apportion> msgResult = new MessageResult<>();
-
-        try {
-            apportion.setUpdateBy(subject);
-            apportion.setUpdateTime(new Date());
-            
-            int affectCount = apportionService.update(apportion);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(apportion);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            Apportion apportion = apportionService.get(id);
-            apportion.setDelFlag(true);
-            apportion.setUpdateBy(subject);
-            apportion.setUpdateTime(new Date());
-
-            int affectCount = apportionService.update(apportion);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                Apportion apportion = apportionService.get(id);
-                apportion.setDelFlag(true);
-                apportion.setUpdateBy(subject);
-                apportion.setUpdateTime(new Date());
-
-                affectCount += apportionService.update(apportion);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String schoolId,String type,String startDate,String endDate,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
-
-        if (StringUtils.isNotEmpty(schoolId)) {
-            searchParams.put("schoolId",schoolId);
-        }
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-        if (StringUtils.isNotEmpty(startDate)) {
-            searchParams.put("startDate",startDate);
-        }
-        if (StringUtils.isNotEmpty(endDate)) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                Date date = sdf.parse(endDate);
-
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(date);
-                calendar.add(calendar.DATE, 1);
-                searchParams.put("endDate", sdf.format(calendar.getTime()));
-            }
-            catch (ParseException e){
-                e.printStackTrace();
-            }
-        }
-
-        Page<Apportion> page = apportionService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-        for(Apportion apportion : page.getResult()){
-            SchoolInfo schoolInfo = schoolInfoService.get(apportion.getSchoolId());
-            apportion.setSchoolName(schoolInfo.getName());
-            DataDictionary dataDictionary = dataDictionaryService.get(apportion.getType());
-            apportion.setTypeName(dataDictionary.getName());
-            User user = userService.get(apportion.getCreateBy());
-            apportion.setCreateByName(user.getRealName());
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="开始派位-小学")
-    @PostMapping("startApportionPrimary")
-    public MessageResult<Map> startApportionPrimary(String schoolId,String type,Integer amount,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            //读取等待派位人员信息列表
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("status","60");
-            if (StringUtils.isNotEmpty(schoolId)) {
-                searchParams.put("schoolId",schoolId);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("C类生证明",type);
-                searchParams.put("categoryId",dataDictionary.getId());
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-
-            //随机抽取
-            if(amount > applicationPrimaryPage.size()){
-                amount = applicationPrimaryPage.size();
-            }
-            List<Integer> integerList = new ArrayList<>();
-            Random random = new Random();
-            for(int i=0;i<amount;i++){
-                for(int j=0;j>-1;j++) {
-                    Integer ran = random.nextInt(applicationPrimaryPage.size());
-                    if (!integerList.contains(ran)) {
-                        integerList.add(ran);
-                        break;
-                    }
-                }
-            }
-
-            //写入派位信息
-            Apportion apportion = new Apportion();
-            apportion.setId(UUID.randomUUID().toString());
-            apportion.setSchoolId(schoolId);
-            apportion.setType(type);
-            apportion.setDelFlag(false);
-            apportion.setCreateBy(subject);
-            apportion.setCreateTime(new Date());
-            apportion.setUpdateBy(subject);
-            apportion.setUpdateTime(new Date());
-            apportionService.insert(apportion);
-
-            if(amount < 1){
-                map.put("apportionId",apportion.getId());
-                msgResult.setResult(true);
-                msgResult.setData(map);
-                return msgResult;
-            }
-
-            //写入派位列表
-            for(int i=0;i<applicationPrimaryPage.size();i++){
-                ApplicationPrimary applicationPrimary = applicationPrimaryPage.get(i);
-                ApportionDetail apportionDetail = new ApportionDetail();
-                apportionDetail.setId(UUID.randomUUID().toString());
-                apportionDetail.setApportionId(apportion.getId());
-                apportionDetail.setApplicationId(applicationPrimary.getId());
-                apportionDetail.setStudentId(applicationPrimary.getStudentId());
-                apportionDetail.setPersonId(applicationPrimary.getPersonId());
-                apportionDetail.setSchoolId(schoolId);
-                Boolean bl = integerList.contains(i) == true ? true : false;
-                apportionDetail.setWinner(bl);
-                apportionDetail.setDelFlag(false);
-                apportionDetail.setCreateBy(subject);
-                apportionDetail.setCreateTime(new Date());
-                apportionDetail.setUpdateBy(subject);
-                apportionDetail.setUpdateTime(new Date());
-                apportionDetailService.insert(apportionDetail);
-
-                if(bl){
-                    applicationPrimary.setStatus(String.valueOf(Integer.parseInt(applicationPrimary.getStatus()) + 10));
-                    applicationPrimary.setOfferId(schoolId);
-                    applicationPrimary.setUpdateBy(subject);
-                    applicationPrimary.setUpdateTime(new Date());
-                    applicationPrimaryService.update(applicationPrimary);
-                }
-            }
-
-            map.put("apportionId",apportion.getId());
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="开始派位-小学-测试")
-    @PostMapping("startApportionPrimaryTest")
-    public MessageResult<Map> startApportionPrimaryTest(String schoolId,String type,Integer amount,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            //读取等待派位人员信息列表
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("status","60");
-            if (StringUtils.isNotEmpty(schoolId)) {
-                searchParams.put("schoolId",schoolId);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("C类生证明",type);
-                searchParams.put("categoryId",dataDictionary.getId());
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-
-            //随机抽取
-            if(amount > applicationPrimaryPage.size()){
-                amount = applicationPrimaryPage.size();
-            }
-            List<Integer> integerList = new ArrayList<>();
-            Random random = new Random();
-            for(int i=0;i<amount;i++){
-                for(int j=0;j>-1;j++) {
-                    Integer ran = random.nextInt(applicationPrimaryPage.size());
-                    if (!integerList.contains(ran)) {
-                        integerList.add(ran);
-                        break;
-                    }
-                }
-            }
-
-            //写入派位信息
-            Apportion apportion = new Apportion();
-            apportion.setId(UUID.randomUUID().toString());
-            apportion.setSchoolId(schoolId);
-            apportion.setType(type);
-            apportion.setDelFlag(false);
-            apportion.setCreateBy("测试派位系统");
-            apportion.setCreateTime(new Date());
-            apportionService.insert(apportion);
-
-            if(amount < 1){
-                map.put("apportionId",apportion.getId());
-                msgResult.setResult(true);
-                msgResult.setData(map);
-                return msgResult;
-            }
-
-            //写入派位列表
-            for(int i=0;i<applicationPrimaryPage.size();i++){
-                ApplicationPrimary applicationPrimary = applicationPrimaryPage.get(i);
-                ApportionDetail apportionDetail = new ApportionDetail();
-                apportionDetail.setId(UUID.randomUUID().toString());
-                apportionDetail.setApportionId(apportion.getId());
-                apportionDetail.setApplicationId(applicationPrimary.getId());
-                apportionDetail.setStudentId(applicationPrimary.getStudentId());
-                apportionDetail.setPersonId(applicationPrimary.getPersonId());
-                apportionDetail.setSchoolId(schoolId);
-                Boolean bl = integerList.contains(i) == true ? true : false;
-                apportionDetail.setWinner(bl);
-                apportionDetail.setDelFlag(true);
-                apportionDetail.setCreateBy("测试派位系统");
-                apportionDetail.setCreateTime(new Date());
-                apportionDetailService.insert(apportionDetail);
-            }
-
-            map.put("apportionId",apportion.getId());
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageListPrimary",method = RequestMethod.POST)
-    public MessageResult<Map> pageListPrimary(
-            @RequestParam(value="schoolId",defaultValue="") String schoolId,
-            @RequestParam(value="type",defaultValue="") String type,
-            @RequestParam(value="categoryValue",defaultValue="") String categoryValue,
-            @RequestParam(value="status",defaultValue="") String status,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-
-        //开始
-        if (StringUtils.isNotEmpty(startStatus)) {
-            searchParams.put("startStatus",startStatus);
-        }
-        //结束
-        if (StringUtils.isNotEmpty(endStatus)) {
-            searchParams.put("endStatus",endStatus);
-        }
-
-        if(StringUtils.isNotEmpty(type)){
-            searchParams.put("type",type);
-        }
-
-        if (StringUtils.isNotEmpty(categoryValue)) {
-            DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("C类生证明",categoryValue);
-            searchParams.put("categoryId",dataDictionary.getId());
-        }
-
-        searchParams.put("delFlag",delFlag);
-
-        if(StringUtils.isNotEmpty(schoolId)){
-            searchParams.put("code", "%" + schoolId + "%");
-        }else{
-            if (!userService.hasRole(subject,"SYSADMIN")) {
-                User user = userService.get(subject);
-                searchParams.put("code", "%" + user.getSchoolId() + "%");
-            }
-        }
-
-
-        //根据用户和角色查询
-        int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-        int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-        int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-        if(count1 > 0){
-            //管理员查全部
-        }else if(count2 > 0){
-            //领导查全部
-        }else if(count3 > 0){
-            //工作人员只能查网上初审10和现场初审20
-            List statusList = new ArrayList();
-            statusList.add("10");
-            statusList.add("20");
-            searchParams.put("orStatus",statusList);
-        }
-
-        Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-        for(ApplicationPrimaryDTO applicationPrimaryDTO : page.getResult()){
-            List<ApportionDetail> adList = apportionDetailService.findByStudentId(applicationPrimaryDTO.getStudentId());
-            ApportionDetail apportionDetail = new ApportionDetail();
-            if(adList.size() > 0){
-                apportionDetail = adList.get(0);
-                SchoolInfo school = schoolInfoService.get(apportionDetail.getSchoolId());
-                apportionDetail.setSchoolName(school.getName());
-            }
-            applicationPrimaryDTO.setApportionDetail(apportionDetail);
-            applicationPrimaryDTO.setCardType(dataDictionaryService.findNameByCatalogNameAndValue("证件类型",applicationPrimaryDTO.getCardType()));
-            applicationPrimaryDTO.setCategoryName(dataDictionaryService.getValue(applicationPrimaryDTO.getCategoryId()));
-            applicationPrimaryDTO.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimaryDTO.getStatus()));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-
-
-    @ApiOperation(value="开始派位-中学")
-    @PostMapping("startApportionMiddle")
-    public MessageResult<Map> startApportionMiddle(String schoolId,String type,Integer amount,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            //读取等待派位人员信息列表
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("status","60");
-            if (StringUtils.isNotEmpty(schoolId)) {
-                searchParams.put("schoolId",schoolId);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationMiddle> ApplicationMiddlePage = applicationMiddleService.pageSearch(searchParams,1,100000,false,sortList);
-
-            //随机抽取
-             if(amount > ApplicationMiddlePage.size()){
-                amount = ApplicationMiddlePage.size();
-            }
-            List<Integer> integerList = new ArrayList<>();
-            Random random = new Random();
-            for(int i=0;i<amount;i++){
-                for(int j=0;j>-1;j++) {
-                    Integer ran = random.nextInt(ApplicationMiddlePage.size());
-                    if (!integerList.contains(ran)) {
-                        integerList.add(ran);
-                        break;
-                    }
-                }
-            }
-
-            //写入派位信息
-            Apportion apportion = new Apportion();
-            apportion.setId(UUID.randomUUID().toString());
-            apportion.setSchoolId(schoolId);
-            apportion.setType(type);
-            apportion.setDelFlag(false);
-            apportion.setCreateBy(subject);
-            apportion.setCreateTime(new Date());
-            apportion.setUpdateBy(subject);
-            apportion.setUpdateTime(new Date());
-            apportionService.insert(apportion);
-
-            if(amount < 1){
-                map.put("apportionId",apportion.getId());
-                msgResult.setResult(true);
-                msgResult.setData(map);
-                return msgResult;
-            }
-
-            //写入派位列表
-            for(int i=0;i<ApplicationMiddlePage.size();i++){
-                ApplicationMiddle applicationMiddle = ApplicationMiddlePage.get(i);
-                ApportionDetail apportionDetail = new ApportionDetail();
-                apportionDetail.setId(UUID.randomUUID().toString());
-                apportionDetail.setApportionId(apportion.getId());
-                apportionDetail.setApplicationId(applicationMiddle.getId());
-                apportionDetail.setStudentId(applicationMiddle.getStudentId());
-                apportionDetail.setPersonId(applicationMiddle.getPersonId());
-                apportionDetail.setSchoolId(schoolId);
-                Boolean bl = integerList.contains(i) == true ? true : false;
-                apportionDetail.setWinner(bl);
-                apportionDetail.setDelFlag(false);
-                apportionDetail.setCreateBy(subject);
-                apportionDetail.setCreateTime(new Date());
-                apportionDetail.setUpdateBy(subject);
-                apportionDetail.setUpdateTime(new Date());
-                apportionDetailService.insert(apportionDetail);
-
-                if(bl){
-                    applicationMiddle.setStatus(String.valueOf(Integer.parseInt(applicationMiddle.getStatus()) + 10));
-                    applicationMiddle.setOfferId(schoolId);
-                    applicationMiddle.setUpdateBy(subject);
-                    applicationMiddle.setUpdateTime(new Date());
-                    applicationMiddleService.update(applicationMiddle);
-                }
-            }
-
-            map.put("apportionId",apportion.getId());
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="开始派位-中学-测试")
-    @PostMapping("startApportionMiddleTest")
-    public MessageResult<Map> startApportionMiddleTest(String schoolId,String type,Integer amount,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            //读取等待派位人员信息列表
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("status","60");
-            if (StringUtils.isNotEmpty(schoolId)) {
-                searchParams.put("schoolId",schoolId);
-            }
-            if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationMiddle> ApplicationMiddlePage = applicationMiddleService.pageSearch(searchParams,1,100000,false,sortList);
-
-            //随机抽取
-            if(amount > ApplicationMiddlePage.size()){
-                amount = ApplicationMiddlePage.size();
-            }
-            List<Integer> integerList = new ArrayList<>();
-            Random random = new Random();
-            for(int i=0;i<amount;i++){
-                for(int j=0;j>-1;j++) {
-                    Integer ran = random.nextInt(ApplicationMiddlePage.size());
-                    if (!integerList.contains(ran)) {
-                        integerList.add(ran);
-                        break;
-                    }
-                }
-            }
-
-            //写入派位信息
-            Apportion apportion = new Apportion();
-            apportion.setId(UUID.randomUUID().toString());
-            apportion.setSchoolId(schoolId);
-            apportion.setType(type);
-            apportion.setDelFlag(false);
-            apportion.setCreateBy("测试派位系统");
-            apportion.setCreateTime(new Date());
-            apportionService.insert(apportion);
-
-            if(amount < 1){
-                map.put("apportionId",apportion.getId());
-                msgResult.setResult(true);
-                msgResult.setData(map);
-                return msgResult;
-            }
-
-            //写入派位列表
-            for(int i=0;i<ApplicationMiddlePage.size();i++){
-                ApplicationMiddle applicationMiddle = ApplicationMiddlePage.get(i);
-                ApportionDetail apportionDetail = new ApportionDetail();
-                apportionDetail.setId(UUID.randomUUID().toString());
-                apportionDetail.setApportionId(apportion.getId());
-                apportionDetail.setApplicationId(applicationMiddle.getId());
-                apportionDetail.setStudentId(applicationMiddle.getStudentId());
-                apportionDetail.setPersonId(applicationMiddle.getPersonId());
-                apportionDetail.setSchoolId(schoolId);
-                Boolean bl = integerList.contains(i) == true ? true : false;
-                apportionDetail.setWinner(bl);
-                apportionDetail.setDelFlag(true);
-                apportionDetail.setCreateBy("测试派位系统");
-                apportionDetail.setCreateTime(new Date());
-                apportionDetailService.insert(apportionDetail);
-            }
-
-            map.put("apportionId",apportion.getId());
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="中学列表")
-    @RequestMapping(value = "pageListMiddle",method = RequestMethod.POST)
-    public MessageResult<Map> pageListMiddle(
-            @RequestParam(value="schoolId",defaultValue="") String schoolId,
-            @RequestParam(value="type",defaultValue="") String type,
-            @RequestParam(value="categoryValue",defaultValue="") String categoryValue,
-            @RequestParam(value="status",defaultValue="") String status,
-            @RequestParam(value="categoryId",defaultValue="") String categoryId,
-            @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestParam(value="startStatus",defaultValue="") String startStatus,
-            @RequestParam(value="endStatus",defaultValue="") String endStatus,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-
-        //开始
-        if (StringUtils.isNotEmpty(startStatus)) {
-            searchParams.put("startStatus",startStatus);
-        }
-        //结束
-        if (StringUtils.isNotEmpty(endStatus)) {
-            searchParams.put("endStatus",endStatus);
-        }
-
-        if(StringUtils.isNotEmpty(type)){
-            searchParams.put("type",type);
-        }
-
-        if (StringUtils.isNotEmpty(categoryValue)) {
-            searchParams.put("categoryId",categoryValue);
-        }
-
-        searchParams.put("delFlag",delFlag);
-
-        if(StringUtils.isNotEmpty(schoolId)){
-            searchParams.put("code", "%" + schoolId + "%");
-        }else{
-            if (!userService.hasRole(subject,"SYSADMIN")) {
-                User user = userService.get(subject);
-                searchParams.put("code", "%" + user.getSchoolId() + "%");
-            }
-        }
-
-
-        //根据用户和角色查询
-        int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
-        int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
-        int count3 = userRoleService.findCountByAIdAndRName(subject,"XFGZRY");
-
-        if(count1 > 0){
-            //管理员查全部
-        }else if(count2 > 0){
-            //领导查全部
-        }else if(count3 > 0){
-            //工作人员只能查网上初审10和现场初审20
-            List statusList = new ArrayList();
-            statusList.add("10");
-            statusList.add("20");
-            searchParams.put("orStatus",statusList);
-        }
-
-        Page<ApplicationMiddleDTO> page = applicationMiddleService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-        for(ApplicationMiddleDTO applicationMiddleDTO : page.getResult()){
-            List<ApportionDetail> adList = apportionDetailService.findByStudentId(applicationMiddleDTO.getStudentId());
-            ApportionDetail apportionDetail = new ApportionDetail();
-            if(adList.size() > 0){
-                apportionDetail = adList.get(0);
-                SchoolInfo school = schoolInfoService.get(apportionDetail.getSchoolId());
-                apportionDetail.setSchoolName(school.getName());
-            }
-            applicationMiddleDTO.setApportionDetail(apportionDetail);
-            applicationMiddleDTO.setCardType(dataDictionaryService.findNameByCatalogNameAndValue("证件类型",applicationMiddleDTO.getCardType()));
-            applicationMiddleDTO.setCategoryName(dataDictionaryService.getValue(applicationMiddleDTO.getCategoryId()));
-            applicationMiddleDTO.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationMiddleDTO.getStatus()));
-            applicationMiddleDTO.setCategoryName(dataDictionaryService.getName(applicationMiddleDTO.getCategoryId()));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/ApportionDetailController.java

@@ -1,473 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.config.OSSConfig;
-import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.supervision.modules.base.entity.*;
-import com.jpsoft.supervision.modules.base.service.*;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.OSSUtil;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/apportionDetail")
-@Api(description = "apportionDetail")
-public class ApportionDetailController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApportionDetailService apportionDetailService;
-    @Autowired
-    private ApplicationPrimaryService applicationPrimaryService;
-    @Autowired
-    private SchoolInfoService schoolInfoService;
-    @Autowired
-    private StudentInfoService studentInfoService;
-    @Autowired
-    private PersonInfoService personInfoService;
-    @Autowired
-    private OSSConfig ossConfig;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<ApportionDetail> create(){
-        MessageResult<ApportionDetail> msgResult = new MessageResult<>();
-
-        ApportionDetail apportionDetail = new ApportionDetail();
-
-        msgResult.setData(apportionDetail);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<ApportionDetail> add(@RequestBody ApportionDetail apportionDetail,@RequestAttribute String subject){
-        MessageResult<ApportionDetail> msgResult = new MessageResult<>();
-
-        try {
-            apportionDetail.setId(UUID.randomUUID().toString());
-            apportionDetail.setDelFlag(false);
-            apportionDetail.setCreateBy(subject);
-            apportionDetail.setCreateTime(new Date());
-            
-            int affectCount = apportionDetailService.insert(apportionDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(apportionDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<ApportionDetail> edit(@PathVariable("id") String id){
-        MessageResult<ApportionDetail> msgResult = new MessageResult<>();
-
-        try {
-            ApportionDetail apportionDetail = apportionDetailService.get(id);
-
-            if (apportionDetail != null) {
-                msgResult.setResult(true);
-                msgResult.setData(apportionDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<ApportionDetail> update(@RequestBody ApportionDetail apportionDetail,@RequestAttribute String subject){
-        MessageResult<ApportionDetail> msgResult = new MessageResult<>();
-
-        try {
-            apportionDetail.setUpdateBy(subject);
-            apportionDetail.setUpdateTime(new Date());
-            
-            int affectCount = apportionDetailService.update(apportionDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(apportionDetail);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            ApportionDetail apportionDetail = apportionDetailService.get(id);
-            apportionDetail.setDelFlag(true);
-            apportionDetail.setUpdateBy(subject);
-            apportionDetail.setUpdateTime(new Date());
-
-            int affectCount = apportionDetailService.update(apportionDetail);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                ApportionDetail apportionDetail = apportionDetailService.get(id);
-                apportionDetail.setDelFlag(true);
-                apportionDetail.setUpdateBy(subject);
-                apportionDetail.setUpdateTime(new Date());
-
-                affectCount += apportionDetailService.update(apportionDetail);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="apportionId",defaultValue="") String apportionId,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestParam(value="winner",defaultValue="true") boolean winner,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("t1.create_time","asc"));
-
-        if (StringUtils.isNotEmpty(apportionId)) {
-            searchParams.put("apportionId",apportionId);
-        }
-
-        searchParams.put("winner",winner);
-        Page<ApportionDetail> page = apportionDetailService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageListTest",method = RequestMethod.POST)
-    public MessageResult<Map> pageListTest(
-            String id,
-            @RequestParam(value="apportionId",defaultValue="") String apportionId,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestParam(value="winner",defaultValue="true") boolean winner,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("t1.create_time","asc"));
-
-        if (StringUtils.isNotEmpty(apportionId)) {
-            searchParams.put("apportionId",apportionId);
-        }
-
-        searchParams.put("winner",winner);
-        searchParams.put("delFlag",true);
-        searchParams.put("createBy","测试派位系统");
-
-        Page<ApportionDetail> page = apportionDetailService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="派位详情列表")
-    @RequestMapping(value = "pageListDTO",method = RequestMethod.POST)
-    public MessageResult<Map> pageListDTO(
-            String apportionId,
-            Boolean winner,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","asc"));
-
-        if (StringUtils.isNotEmpty(apportionId)) {
-            searchParams.put("apportionId",apportionId);
-        }
-        if (winner != null) {
-            searchParams.put("winner",winner);
-        }
-
-        Page<ApportionDetailDTO> page = apportionDetailService.pageSearchDTO(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="统计：派位详情列表")
-    @PostMapping("startApportionPrimary")
-    public MessageResult<Map> startApportionPrimary(String apportionId,@RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String,Object> map = new HashMap<>();
-
-        try {
-            Map<String,Object> searchParams = new HashMap<>();
-            if (StringUtils.isNotEmpty(apportionId)) {
-                searchParams.put("apportionId",apportionId);
-            }
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
-            Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("all",applicationPrimaryPage.size());
-
-            searchParams.put("winner",true);
-            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("winner",applicationPrimaryPage.size());
-
-            searchParams.put("winner",false);
-            applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
-            map.put("loser",applicationPrimaryPage.size());
-
-            msgResult.setResult(true);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value = "导出派位结果")
-    @PostMapping("exportXlsPwjg")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apportionId", value = "派位ID", required = false, paramType = "form", dataType = "String"),
-            @ApiImplicitParam(name = "winner", value = "派位结果", required = false, paramType = "form", dataType = "boolean"),
-    })
-    public MessageResult<String> exportXlsPwjg(
-            @RequestParam(value="apportionId",defaultValue="") String apportionId,
-            @RequestParam(value="winner",defaultValue="true") boolean winner,
-            @RequestAttribute String subject) {
-        MessageResult<String> msgResult = new MessageResult<>();
-        try {
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            HSSFSheet sheet = workbook.createSheet();
-            //表头
-            HSSFRow rowTitle = sheet.createRow(0);
-            HSSFCell cellTitle1 = rowTitle.createCell(0);
-            cellTitle1.setCellValue("序号");
-            HSSFCell cellTitle2 = rowTitle.createCell(1);
-            cellTitle2.setCellValue("预录取学校");
-            HSSFCell cellTitle3 = rowTitle.createCell(2);
-            cellTitle3.setCellValue("学生姓名");
-            HSSFCell cellTitle4 = rowTitle.createCell(3);
-            cellTitle4.setCellValue("学生证件号");
-            HSSFCell cellTitle5 = rowTitle.createCell(4);
-            cellTitle5.setCellValue("登记人姓名");
-            HSSFCell cellTitle6 = rowTitle.createCell(5);
-            cellTitle6.setCellValue("登记人手机号码");
-            HSSFCell cellTitle7 = rowTitle.createCell(6);
-            cellTitle7.setCellValue("结果");
-
-            //预录取学校
-            sheet.setColumnWidth(1, 20 * 256);
-            //姓名
-            sheet.setColumnWidth(2, 20 * 256);
-            //证件号
-            sheet.setColumnWidth(3, 24 * 256);
-            //姓名
-            sheet.setColumnWidth(4, 20 * 256);
-            //手机号
-            sheet.setColumnWidth(5, 24 * 256);
-            //结果
-            sheet.setColumnWidth(6, 10 * 256);
-
-            Map<String,Object> searchParams = new HashMap<>();
-
-            List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("t1.create_time","asc"));
-
-            if (StringUtils.isNotEmpty(apportionId)) {
-                searchParams.put("apportionId",apportionId);
-            }
-
-            searchParams.put("winner",winner);
-            Page<ApportionDetail> page = apportionDetailService.pageSearch(searchParams,0,1000000,false,sortList);
-
-            for (int i = 0; i < page.size(); i++) {
-                ApportionDetail ad = page.get(i);
-                StudentInfo studentInfo = studentInfoService.get(ad.getStudentId());
-
-
-                HSSFRow rowContent = sheet.createRow(i + 1);
-                //"序号"
-                HSSFCell cellContent1 = rowContent.createCell(0);
-                cellContent1.setCellValue(i + 1);
-//                "预录取学校"
-                HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(ad.getSchoolName());
-//                "学生姓名"
-                HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(ad.getStudentName());
-//                "证件号码"
-                HSSFCell cellContent4 = rowContent.createCell(3);
-                cellContent4.setCellValue(studentInfo.getIdCard());
-                if(StringUtils.isNotEmpty(ad.getPersonId())){
-                    //"登记人姓名"
-                    HSSFCell cellContent5 = rowContent.createCell(4);
-                    PersonInfo personInfo = personInfoService.get(ad.getPersonId());
-                    cellContent5.setCellValue(personInfo.getName());
-
-                    //"登记人手机号码"
-                    HSSFCell cellContent6 = rowContent.createCell(5);
-                    cellContent6.setCellValue(personInfo.getPhone());
-                }
-                //"结果"
-                HSSFCell cellContent7 = rowContent.createCell(6);
-                String winnerStr = "成功";
-                if(ad.getWinner()){
-                    winnerStr = "成功";
-                }else{
-                    winnerStr = "失败";
-                }
-                cellContent7.setCellValue(winnerStr);
-            }
-
-            //todo 将wb保存到oss
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            workbook.write(output);
-
-            byte[] buffer = output.toByteArray();
-            ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-
-            String downloadUrl = OSSUtil.upload(ossConfig, "import", "error.xls", input);
-
-            //todo 返回导入失败报表下载链接
-
-            msgResult.setData(downloadUrl);
-            msgResult.setResult(true);
-        } catch (Exception ex) {
-            logger.error(ex.getMessage(), ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/ApprovalInfoController.java

@@ -1,223 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
-import com.jpsoft.supervision.modules.base.service.ApprovalInfoService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/approvalInfo")
-@Api(description = "approvalInfo")
-public class ApprovalInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApprovalInfoService approvalInfoService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<ApprovalInfo> create(){
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        ApprovalInfo approvalInfo = new ApprovalInfo();
-
-        msgResult.setData(approvalInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<ApprovalInfo> add(@RequestBody ApprovalInfo approvalInfo,@RequestAttribute String subject){
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            approvalInfo.setId(UUID.randomUUID().toString());
-            approvalInfo.setDelFlag(false);
-            approvalInfo.setCreateBy(subject);
-            approvalInfo.setCreateTime(new Date());
-            
-            int affectCount = approvalInfoService.insert(approvalInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<ApprovalInfo> edit(@PathVariable("id") String id){
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            ApprovalInfo approvalInfo = approvalInfoService.get(id);
-
-            if (approvalInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<ApprovalInfo> update(@RequestBody ApprovalInfo approvalInfo,@RequestAttribute String subject){
-        MessageResult<ApprovalInfo> msgResult = new MessageResult<>();
-
-        try {
-            approvalInfo.setUpdateBy(subject);
-            approvalInfo.setUpdateTime(new Date());
-            
-            int affectCount = approvalInfoService.update(approvalInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(approvalInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            ApprovalInfo approvalInfo = approvalInfoService.get(id);
-            approvalInfo.setDelFlag(true);
-            approvalInfo.setUpdateBy(subject);
-            approvalInfo.setUpdateTime(new Date());
-
-            int affectCount = approvalInfoService.update(approvalInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                ApprovalInfo approvalInfo = approvalInfoService.get(id);
-                approvalInfo.setDelFlag(true);
-                approvalInfo.setUpdateBy(subject);
-                approvalInfo.setUpdateTime(new Date());
-
-                affectCount += approvalInfoService.update(approvalInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","asc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        Page<ApprovalInfo> page = approvalInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/DistrictInfoController.java

@@ -1,242 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
-import com.jpsoft.supervision.modules.base.service.DistrictInfoService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/districtInfo")
-@Api(description = "districtInfo")
-public class DistrictInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private DistrictInfoService districtInfoService;
-    @Autowired
-    private DataDictionaryService dataDictionaryService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<DistrictInfo> create(){
-        MessageResult<DistrictInfo> msgResult = new MessageResult<>();
-
-        DistrictInfo districtInfo = new DistrictInfo();
-
-        msgResult.setData(districtInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<DistrictInfo> add(@RequestBody DistrictInfo districtInfo,@RequestAttribute String subject){
-        MessageResult<DistrictInfo> msgResult = new MessageResult<>();
-
-        try {
-            districtInfo.setId(UUID.randomUUID().toString());
-            districtInfo.setDelFlag(false);
-            districtInfo.setCreateBy(subject);
-            districtInfo.setCreateTime(new Date());
-            
-            int affectCount = districtInfoService.insert(districtInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(districtInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<DistrictInfo> edit(@PathVariable("id") String id){
-        MessageResult<DistrictInfo> msgResult = new MessageResult<>();
-
-        try {
-            DistrictInfo districtInfo = districtInfoService.get(id);
-
-            if (districtInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(districtInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<DistrictInfo> update(@RequestBody DistrictInfo districtInfo,@RequestAttribute String subject){
-        MessageResult<DistrictInfo> msgResult = new MessageResult<>();
-
-        try {
-            districtInfo.setUpdateBy(subject);
-            districtInfo.setUpdateTime(new Date());
-            
-            int affectCount = districtInfoService.update(districtInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(districtInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            DistrictInfo districtInfo = districtInfoService.get(id);
-            districtInfo.setDelFlag(true);
-            districtInfo.setUpdateBy(subject);
-            districtInfo.setUpdateTime(new Date());
-
-            int affectCount = districtInfoService.update(districtInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                DistrictInfo districtInfo = districtInfoService.get(id);
-                districtInfo.setDelFlag(true);
-                districtInfo.setUpdateBy(subject);
-                districtInfo.setUpdateTime(new Date());
-
-                affectCount += districtInfoService.update(districtInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="name",defaultValue="") String name,
-            @RequestParam(value="streetId",defaultValue="") String streetId,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        if (StringUtils.isNotEmpty(name)) {
-            searchParams.put("name" , "%" + name + "%");
-        }
-
-        if (StringUtils.isNotEmpty(streetId)) {
-            searchParams.put("streetId" , streetId);
-        }
-
-        Page<DistrictInfo> page = districtInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-        for(DistrictInfo districtInfo : page.getResult()){
-            if(StringUtils.isNotEmpty(districtInfo.getStreetId())) {
-                String streeName = dataDictionaryService.getName(districtInfo.getStreetId());
-                districtInfo.setStreetName(streeName);
-            }
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/NewsInfoController.java

@@ -1,281 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.NewsInfo;
-import com.jpsoft.supervision.modules.base.service.NewsInfoService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/newsInfo")
-@Api(description = "newsInfo")
-public class NewsInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private NewsInfoService newsInfoService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<NewsInfo> create(){
-        MessageResult<NewsInfo> msgResult = new MessageResult<>();
-
-        NewsInfo newsInfo = new NewsInfo();
-
-        msgResult.setData(newsInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<NewsInfo> add(@RequestBody NewsInfo newsInfo,@RequestAttribute String subject){
-        MessageResult<NewsInfo> msgResult = new MessageResult<>();
-
-        try {
-            newsInfo.setId(UUID.randomUUID().toString());
-            newsInfo.setDelFlag(false);
-            newsInfo.setCreateBy(subject);
-            newsInfo.setCreateTime(new Date());
-            
-            int affectCount = newsInfoService.insert(newsInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(newsInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<NewsInfo> edit(@PathVariable("id") String id){
-        MessageResult<NewsInfo> msgResult = new MessageResult<>();
-
-        try {
-            NewsInfo newsInfo = newsInfoService.get(id);
-
-            if (newsInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(newsInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<NewsInfo> update(@RequestBody NewsInfo newsInfo,@RequestAttribute String subject){
-        MessageResult<NewsInfo> msgResult = new MessageResult<>();
-
-        try {
-            newsInfo.setUpdateBy(subject);
-            newsInfo.setUpdateTime(new Date());
-            
-            int affectCount = newsInfoService.update(newsInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(newsInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            NewsInfo newsInfo = newsInfoService.get(id);
-            newsInfo.setDelFlag(true);
-            newsInfo.setUpdateBy(subject);
-            newsInfo.setUpdateTime(new Date());
-
-            int affectCount = newsInfoService.update(newsInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                NewsInfo newsInfo = newsInfoService.get(id);
-                newsInfo.setDelFlag(true);
-                newsInfo.setUpdateBy(subject);
-                newsInfo.setUpdateTime(new Date());
-
-                affectCount += newsInfoService.update(newsInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="title",defaultValue="") String title,
-            @RequestParam(value="type",defaultValue="") String type,
-            @RequestParam(value="status",defaultValue="") String status,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("sort_no","is null"));
-        sortList.add(new Sort("sort_no","asc"));
-        sortList.add(new Sort("create_time","desc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        if (StringUtils.isNotEmpty(title)) {
-            searchParams.put("title","%" + title + "%");
-        }
-
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type",type);
-        }
-
-        if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
-        }
-
-        Page<NewsInfo> page = newsInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="修改新闻状态")
-    @RequestMapping(value = "modifyStatus",method = RequestMethod.POST)
-    public MessageResult<Integer> modifyStatus(
-            @RequestParam(value="status",defaultValue="") String status,
-            @RequestParam(value="idList",defaultValue="")  List<String> idList,
-            @RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            if(StringUtils.isEmpty(status)){
-                throw new Exception("错误,请联系管理员");
-            }
-
-            for (String id : idList) {
-                NewsInfo newsInfo = newsInfoService.get(id);
-                newsInfo.setStatus(status);
-                newsInfo.setUpdateBy(subject);
-                newsInfo.setUpdateTime(new Date());
-                affectCount += newsInfoService.update(newsInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("操作失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/OfferInfoController.java

@@ -1,223 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.OfferInfo;
-import com.jpsoft.supervision.modules.base.service.OfferInfoService;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/offerInfo")
-@Api(description = "offerInfo")
-public class OfferInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private OfferInfoService offerInfoService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<OfferInfo> create(){
-        MessageResult<OfferInfo> msgResult = new MessageResult<>();
-
-        OfferInfo offerInfo = new OfferInfo();
-
-        msgResult.setData(offerInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<OfferInfo> add(@RequestBody OfferInfo offerInfo,@RequestAttribute String subject){
-        MessageResult<OfferInfo> msgResult = new MessageResult<>();
-
-        try {
-            offerInfo.setId(UUID.randomUUID().toString());
-            offerInfo.setDelFlag(false);
-            offerInfo.setCreateBy(subject);
-            offerInfo.setCreateTime(new Date());
-            
-            int affectCount = offerInfoService.insert(offerInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(offerInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<OfferInfo> edit(@PathVariable("id") String id){
-        MessageResult<OfferInfo> msgResult = new MessageResult<>();
-
-        try {
-            OfferInfo offerInfo = offerInfoService.get(id);
-
-            if (offerInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(offerInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<OfferInfo> update(@RequestBody OfferInfo offerInfo,@RequestAttribute String subject){
-        MessageResult<OfferInfo> msgResult = new MessageResult<>();
-
-        try {
-            offerInfo.setUpdateBy(subject);
-            offerInfo.setUpdateTime(new Date());
-            
-            int affectCount = offerInfoService.update(offerInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(offerInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            OfferInfo offerInfo = offerInfoService.get(id);
-            offerInfo.setDelFlag(true);
-            offerInfo.setUpdateBy(subject);
-            offerInfo.setUpdateTime(new Date());
-
-            int affectCount = offerInfoService.update(offerInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                OfferInfo offerInfo = offerInfoService.get(id);
-                offerInfo.setDelFlag(true);
-                offerInfo.setUpdateBy(subject);
-                offerInfo.setUpdateTime(new Date());
-
-                affectCount += offerInfoService.update(offerInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        Page<OfferInfo> page = offerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/PersonInfoController.java

@@ -1,236 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.PersonInfo;
-import com.jpsoft.supervision.modules.base.service.PersonInfoService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/personInfo")
-@Api(description = "personInfo")
-public class PersonInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private PersonInfoService personInfoService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<PersonInfo> create(){
-        MessageResult<PersonInfo> msgResult = new MessageResult<>();
-
-        PersonInfo personInfo = new PersonInfo();
-
-        msgResult.setData(personInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<PersonInfo> add(@RequestBody PersonInfo personInfo,@RequestAttribute String subject){
-        MessageResult<PersonInfo> msgResult = new MessageResult<>();
-
-        try {
-            personInfo.setId(UUID.randomUUID().toString());
-            personInfo.setDelFlag(false);
-            personInfo.setCreateBy(subject);
-            personInfo.setCreateTime(new Date());
-            
-            int affectCount = personInfoService.insert(personInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(personInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<PersonInfo> edit(@PathVariable("id") String id){
-        MessageResult<PersonInfo> msgResult = new MessageResult<>();
-
-        try {
-            PersonInfo personInfo = personInfoService.get(id);
-
-            if (personInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(personInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<PersonInfo> update(@RequestBody PersonInfo personInfo,@RequestAttribute String subject){
-        MessageResult<PersonInfo> msgResult = new MessageResult<>();
-
-        try {
-            personInfo.setUpdateBy(subject);
-            personInfo.setUpdateTime(new Date());
-            
-            int affectCount = personInfoService.update(personInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(personInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            PersonInfo personInfo = personInfoService.get(id);
-            personInfo.setDelFlag(true);
-            personInfo.setUpdateBy(subject);
-            personInfo.setUpdateTime(new Date());
-
-            int affectCount = personInfoService.update(personInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                PersonInfo personInfo = personInfoService.get(id);
-                personInfo.setDelFlag(true);
-                personInfo.setUpdateBy(subject);
-                personInfo.setUpdateTime(new Date());
-
-                affectCount += personInfoService.update(personInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="name",defaultValue="") String name,
-            @RequestParam(value="idCard",defaultValue="") String idCard,
-            @RequestParam(value="phone",defaultValue="") String phone,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        if (StringUtils.isNotEmpty(name)) {
-            searchParams.put("name","%" + name + "%");
-        }
-        if (StringUtils.isNotEmpty(phone)) {
-            searchParams.put("phone","%" + phone + "%");
-        }
-        if (StringUtils.isNotEmpty(idCard)) {
-            searchParams.put("idCard","%" + idCard + "%");
-        }
-
-        Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/PersonStudentController.java

@@ -1,223 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.PersonStudent;
-import com.jpsoft.supervision.modules.base.service.PersonStudentService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/personStudent")
-@Api(description = "personStudent")
-public class PersonStudentController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private PersonStudentService personStudentService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<PersonStudent> create(){
-        MessageResult<PersonStudent> msgResult = new MessageResult<>();
-
-        PersonStudent personStudent = new PersonStudent();
-
-        msgResult.setData(personStudent);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<PersonStudent> add(@RequestBody PersonStudent personStudent,@RequestAttribute String subject){
-        MessageResult<PersonStudent> msgResult = new MessageResult<>();
-
-        try {
-            personStudent.setId(UUID.randomUUID().toString());
-            personStudent.setDelFlag(false);
-            personStudent.setCreateBy(subject);
-            personStudent.setCreateTime(new Date());
-            
-            int affectCount = personStudentService.insert(personStudent);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(personStudent);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<PersonStudent> edit(@PathVariable("id") String id){
-        MessageResult<PersonStudent> msgResult = new MessageResult<>();
-
-        try {
-            PersonStudent personStudent = personStudentService.get(id);
-
-            if (personStudent != null) {
-                msgResult.setResult(true);
-                msgResult.setData(personStudent);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<PersonStudent> update(@RequestBody PersonStudent personStudent,@RequestAttribute String subject){
-        MessageResult<PersonStudent> msgResult = new MessageResult<>();
-
-        try {
-            personStudent.setUpdateBy(subject);
-            personStudent.setUpdateTime(new Date());
-            
-            int affectCount = personStudentService.update(personStudent);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(personStudent);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            PersonStudent personStudent = personStudentService.get(id);
-            personStudent.setDelFlag(true);
-            personStudent.setUpdateBy(subject);
-            personStudent.setUpdateTime(new Date());
-
-            int affectCount = personStudentService.update(personStudent);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                PersonStudent personStudent = personStudentService.get(id);
-                personStudent.setDelFlag(true);
-                personStudent.setUpdateBy(subject);
-                personStudent.setUpdateTime(new Date());
-
-                affectCount += personStudentService.update(personStudent);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        Page<PersonStudent> page = personStudentService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/SchoolInfoController.java

@@ -1,375 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
-import com.jpsoft.supervision.modules.base.service.SchoolInfoService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import com.jpsoft.supervision.modules.sys.entity.User;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
-import com.jpsoft.supervision.modules.sys.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/schoolInfo")
-@Api(description = "schoolInfo")
-public class SchoolInfoController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private SchoolInfoService schoolInfoService;
-
-    @Autowired
-    private DataDictionaryService dataDictionaryService;
-
-    @Autowired
-    private UserService userService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<SchoolInfo> create(){
-        MessageResult<SchoolInfo> msgResult = new MessageResult<>();
-
-        SchoolInfo schoolInfo = new SchoolInfo();
-
-        msgResult.setData(schoolInfo);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<SchoolInfo> add(@RequestBody SchoolInfo schoolInfo,@RequestAttribute String subject){
-        MessageResult<SchoolInfo> msgResult = new MessageResult<>();
-
-        try {
-            schoolInfo.setId(UUID.randomUUID().toString());
-            schoolInfo.setDelFlag(false);
-            schoolInfo.setCreateBy(subject);
-            schoolInfo.setCreateTime(new Date());
-
-            //保存code
-            String code = schoolInfo.getId();
-            if("1".equals(schoolInfo.getType())){
-                //为学校,保存 上级id + , + 自身ID
-                code = schoolInfo.getParentId() + "," + code;
-            }
-            schoolInfo.setCode(code);
-            
-            int affectCount = schoolInfoService.insert(schoolInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(schoolInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<SchoolInfo> edit(@PathVariable("id") String id){
-        MessageResult<SchoolInfo> msgResult = new MessageResult<>();
-
-        try {
-            SchoolInfo schoolInfo = schoolInfoService.get(id);
-
-            if (schoolInfo != null) {
-                msgResult.setResult(true);
-                msgResult.setData(schoolInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<SchoolInfo> update(@RequestBody SchoolInfo schoolInfo,@RequestAttribute String subject){
-        MessageResult<SchoolInfo> msgResult = new MessageResult<>();
-
-        try {
-            schoolInfo.setUpdateBy(subject);
-            schoolInfo.setUpdateTime(new Date());
-
-            //保存code
-            String code = schoolInfo.getId();
-            if("1".equals(schoolInfo.getType())){
-                //为学校,保存 上级id + , + 自身ID
-                code = schoolInfo.getParentId() + "," + code;
-            }
-            schoolInfo.setCode(code);
-            int affectCount = schoolInfoService.update(schoolInfo);
-
-
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(schoolInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            SchoolInfo schoolInfo = schoolInfoService.get(id);
-            schoolInfo.setDelFlag(true);
-            schoolInfo.setUpdateBy(subject);
-            schoolInfo.setUpdateTime(new Date());
-
-            //如果为校区修改包含学校的code
-            if("2".equals(schoolInfo.getType())){
-                List<SchoolInfo> siList = schoolInfoService.findByParentId(schoolInfo.getId());
-                for(SchoolInfo si : siList){
-                    si.setParentId(null);
-                    si.setCode(si.getId());
-                    schoolInfoService.updateParentIdNull(si);
-                }
-            }
-
-            int affectCount = schoolInfoService.update(schoolInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                SchoolInfo schoolInfo = schoolInfoService.get(id);
-                schoolInfo.setDelFlag(true);
-                schoolInfo.setUpdateBy(subject);
-                schoolInfo.setUpdateTime(new Date());
-
-                //如果为校区修改包含学校的code
-                if("2".equals(schoolInfo.getType())){
-                    List<SchoolInfo> siList = schoolInfoService.findByParentId(schoolInfo.getId());
-                    for(SchoolInfo si : siList){
-                        si.setParentId(null);
-                        si.setCode(si.getId());
-                        schoolInfoService.update(si);
-                    }
-                }
-
-                affectCount += schoolInfoService.update(schoolInfo);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="name",defaultValue="") String name,
-            @RequestParam(value="enrollmentType",defaultValue="") String enrollmentType,
-            @RequestParam(value="type",defaultValue="") String type,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.type_","desc"));
-        sortList.add(new Sort("b.school_code","asc"));
-        sortList.add(new Sort("a.school_code","asc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        if (StringUtils.isNotEmpty(name)) {
-            searchParams.put("name" , "%" + name + "%");
-        }
-
-        if (StringUtils.isNotEmpty(enrollmentType)) {
-            searchParams.put("enrollmentType" , enrollmentType);
-        }
-
-        if (StringUtils.isNotEmpty(type)) {
-            searchParams.put("type" , type);
-        }
-
-        if (!userService.hasRole(subject,"SYSADMIN")) {
-            User user = userService.get(subject);
-            searchParams.put("code", "%" + user.getSchoolId() + "%");
-        }
-
-        Page<SchoolInfo> page = schoolInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-        for(SchoolInfo school : page.getResult()){
-            String emTypes = school.getEnrollmentType();
-            if(StringUtils.isEmpty(emTypes)){
-                continue;
-            }
-            String[] eTypes =  emTypes.split(",");
-            String eTypesName = "";
-            for(String eType : eTypes){
-                if(StringUtils.isNotEmpty(eType)){
-                    eTypesName += dataDictionaryService.findNameByCatalogNameAndValue("招生类型",eType) + ",";
-                }
-            }
-            school.setEnrollmentTypeName(eTypesName.substring(0,eTypesName.length()-1));
-        }
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="校园列表")
-    @RequestMapping(value = "list",method = RequestMethod.POST)
-    public MessageResult<List> list(
-            String id,
-            String type,
-            String enrollmentType,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<List> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("parent_id","asc"));
-        sortList.add(new Sort("code_","asc"));
-
-        if (!userService.hasRole(subject,"SYSADMIN")) {
-            User user = userService.get(subject);
-            searchParams.put("code", "%" + user.getSchoolId() + "%");
-        }
-        if(StringUtils.isNotEmpty(type)){
-            searchParams.put("type", type);
-        }
-        if(StringUtils.isNotEmpty(enrollmentType)){
-            searchParams.put("enrollmentType", "%" + enrollmentType + "%");
-        }
-
-        Page<SchoolInfo> page = schoolInfoService.pageSearch(searchParams,0,10000,false,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(page);
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="查询子单位")
-    @RequestMapping(value = "children",method = RequestMethod.POST)
-    public MessageResult<List<SchoolInfo>> children(String parentId){
-        MessageResult<List<SchoolInfo>> msgResult = new MessageResult<>();
-
-        try {
-            List<SchoolInfo> list = schoolInfoService.findByParentId(parentId);
-
-            List<SchoolInfo> dtoList = new ArrayList<>();
-
-            for (SchoolInfo companyInfo : list) {
-                SchoolInfo dto = new SchoolInfo();
-
-                PojoUtils.map(companyInfo,dto);
-
-                Boolean hasChildren = schoolInfoService.hasChildren(companyInfo.getId());
-                dto.setHasChildren(hasChildren);
-
-                dtoList.add(dto);
-            }
-
-            msgResult.setResult(true);
-            msgResult.setData(dtoList);
-        }
-        catch (Exception ex){
-            msgResult.setResult(false);
-            logger.error(ex.getMessage(),ex);
-        }
-
-        return msgResult;
-    }
-}

web/src/main/java/com/jpsoft/supervision/modules/base/controller/StudentFilesController.java

@@ -1,223 +0,0 @@
-package com.jpsoft.supervision.modules.base.controller;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.base.entity.StudentFiles;
-import com.jpsoft.supervision.modules.base.service.StudentFilesService;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
-import com.jpsoft.supervision.modules.common.utils.PojoUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-@RequestMapping("/base/studentFiles")
-@Api(description = "studentFiles")
-public class StudentFilesController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private StudentFilesService studentFilesService;
-
-    @ApiOperation(value="创建空记录")
-    @GetMapping("create")
-    public MessageResult<StudentFiles> create(){
-        MessageResult<StudentFiles> msgResult = new MessageResult<>();
-
-        StudentFiles studentFiles = new StudentFiles();
-
-        msgResult.setData(studentFiles);
-        msgResult.setResult(true);
-
-        return msgResult;
-    }
-    
-    @ApiOperation(value="添加信息")
-    @PostMapping("add")
-    public MessageResult<StudentFiles> add(@RequestBody StudentFiles studentFiles,@RequestAttribute String subject){
-        MessageResult<StudentFiles> msgResult = new MessageResult<>();
-
-        try {
-            studentFiles.setId(UUID.randomUUID().toString());
-            studentFiles.setDelFlag(false);
-            studentFiles.setCreateBy(subject);
-            studentFiles.setCreateTime(new Date());
-            
-            int affectCount = studentFilesService.insert(studentFiles);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(studentFiles);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="获取信息")
-    @GetMapping("edit/{id}")
-    public MessageResult<StudentFiles> edit(@PathVariable("id") String id){
-        MessageResult<StudentFiles> msgResult = new MessageResult<>();
-
-        try {
-            StudentFiles studentFiles = studentFilesService.get(id);
-
-            if (studentFiles != null) {
-                msgResult.setResult(true);
-                msgResult.setData(studentFiles);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库不存在该记录!");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="更新用户")
-    @PostMapping("update")
-    public MessageResult<StudentFiles> update(@RequestBody StudentFiles studentFiles,@RequestAttribute String subject){
-        MessageResult<StudentFiles> msgResult = new MessageResult<>();
-
-        try {
-            studentFiles.setUpdateBy(subject);
-            studentFiles.setUpdateTime(new Date());
-            
-            int affectCount = studentFilesService.update(studentFiles);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(studentFiles);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库更新失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-	@ApiOperation(value="删除")
-    @PostMapping("delete/{id}")
-    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            StudentFiles studentFiles = studentFilesService.get(id);
-            studentFiles.setDelFlag(true);
-            studentFiles.setUpdateBy(subject);
-            studentFiles.setUpdateTime(new Date());
-
-            int affectCount = studentFilesService.update(studentFiles);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-    @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
-        MessageResult<Integer> msgResult = new MessageResult<>();
-
-        try {
-            int affectCount = 0;
-
-            for (String id : idList) {
-                StudentFiles studentFiles = studentFilesService.get(id);
-                studentFiles.setDelFlag(true);
-                studentFiles.setUpdateBy(subject);
-                studentFiles.setUpdateTime(new Date());
-
-                affectCount += studentFilesService.update(studentFiles);
-            }
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(affectCount);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("删除失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
-    public MessageResult<Map> pageList(
-            String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
-        MessageResult<Map> msgResult = new MessageResult<>();
-
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        Page<StudentFiles> page = studentFilesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
-
-        return msgResult;
-    }
-}