演示前版本备份

logs/springboot-logback-info.log

-2023-09-04 10:22:15,737 [main]  INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$610e7030] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-09-04 10:22:15,939 [main]  INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:90 - Tomcat initialized with port(s): 34567 (http)
-2023-09-04 10:22:15,950 [main]  INFO org.apache.coyote.http11.Http11NioProtocol:173 - Initializing ProtocolHandler ["http-nio-34567"]
-2023-09-04 10:22:15,957 [main]  INFO org.apache.catalina.core.StandardService:173 - Starting service [Tomcat]
-2023-09-04 10:22:15,958 [main]  INFO org.apache.catalina.core.StandardEngine:173 - Starting Servlet engine: [Apache Tomcat/9.0.22]
-2023-09-04 10:22:15,963 [main]  INFO org.apache.catalina.core.AprLifecycleListener:173 - Loaded APR based Apache Tomcat Native library [1.2.37] using APR version [1.7.4].
-2023-09-04 10:22:15,963 [main]  INFO org.apache.catalina.core.AprLifecycleListener:173 - APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true].
-2023-09-04 10:22:15,964 [main]  INFO org.apache.catalina.core.AprLifecycleListener:173 - APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true]
-2023-09-04 10:22:15,974 [main]  INFO org.apache.catalina.core.AprLifecycleListener:173 - OpenSSL successfully initialized [OpenSSL 1.1.1u  30 May 2023]
-2023-09-04 10:22:16,055 [main]  INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring embedded WebApplicationContext
-2023-09-04 10:22:16,056 [main]  INFO org.springframework.web.context.ContextLoader:284 - Root WebApplicationContext: initialization completed in 1407 ms
-2023-09-04 10:22:16,157 [main]  INFO com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure:56 - Init DruidDataSource
-2023-09-04 10:22:17,297 [main]  INFO com.alibaba.druid.pool.DruidDataSource:994 - {dataSource-1} inited
-2023-09-04 10:22:18,939 [main]  INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping:69 - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
-2023-09-04 10:22:19,028 [main]  INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:171 - Initializing ExecutorService 'applicationTaskExecutor'
-2023-09-04 10:22:19,226 [main]  INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:160 - Context refreshed
-2023-09-04 10:22:19,239 [main]  INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:163 - Found 1 custom documentation plugin(s)
-2023-09-04 10:22:19,266 [main]  INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner:41 - Scanning for api listing references
-2023-09-04 10:22:19,499 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: addJobUsingPOST_1
-2023-09-04 10:22:19,500 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteJobUsingPOST_1
-2023-09-04 10:22:19,501 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateJobUsingPOST_1
-2023-09-04 10:22:19,525 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: addPositionUsingPOST_1
-2023-09-04 10:22:19,526 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deletePositionUsingPOST_1
-2023-09-04 10:22:19,527 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updatePositionUsingPOST_1
-2023-09-04 10:22:19,550 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: importUsersUsingPOST_1
-2023-09-04 10:22:19,558 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: addAdministerUsingPOST_1
-2023-09-04 10:22:19,566 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateAdministerUsingPOST_1
-2023-09-04 10:22:19,568 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: addGeoUsingPOST_1
-2023-09-04 10:22:19,569 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteGeoUsingPOST_1
-2023-09-04 10:22:19,570 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateGeoUsingPOST_1
-2023-09-04 10:22:19,571 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteRequireUsingPOST_1
-2023-09-04 10:22:19,571 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: requireStationsUsingPOST_1
-2023-09-04 10:22:19,572 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: requiresUsingPOST_1
-2023-09-04 10:22:19,573 [main]  INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: shareUsingPOST_1
-2023-09-04 10:22:19,586 [main]  INFO org.apache.coyote.http11.Http11NioProtocol:173 - Starting ProtocolHandler ["http-nio-34567"]
-2023-09-04 10:22:19,604 [main]  INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:202 - Tomcat started on port(s): 34567 (http) with context path ''
-2023-09-04 10:22:57,210 [http-nio-34567-exec-1]  INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring DispatcherServlet 'dispatcherServlet'
-2023-09-04 10:22:57,210 [http-nio-34567-exec-1]  INFO org.springframework.web.servlet.DispatcherServlet:524 - Initializing Servlet 'dispatcherServlet'
-2023-09-04 10:22:57,216 [http-nio-34567-exec-1]  INFO org.springframework.web.servlet.DispatcherServlet:546 - Completed initialization in 6 ms
-2023-09-04 14:29:16,253 [Thread-13]  INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:208 - Shutting down ExecutorService 'applicationTaskExecutor'
-2023-09-04 14:29:16,268 [Thread-13]  INFO com.alibaba.druid.pool.DruidDataSource:2029 - {dataSource-1} closing ...
-2023-09-04 14:29:16,317 [Thread-13]  INFO com.alibaba.druid.pool.DruidDataSource:2101 - {dataSource-1} closed
+2024-11-27 13:10:42,286 [Thread-12]  INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:208 - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-11-27 13:10:42,291 [Thread-12]  INFO com.alibaba.druid.pool.DruidDataSource:2029 - {dataSource-1} closing ...
+2024-11-27 13:10:42,292 [Thread-12]  INFO com.alibaba.druid.pool.DruidDataSource:2101 - {dataSource-1} closed

src/main/java/com/laowu/controller/AssistCompanyController.java

+package com.laowu.controller;
+
+
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.service.AssistCompanyService;
+import com.laowu.util.ResponseData;
+import com.laowu.util.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@RestController
+@Api(tags = "就近就业企业")
+@RequestMapping("/assistCompanys")
+public class AssistCompanyController {
+
+    @Autowired
+    private AssistCompanyService assistCompanyService;
+
+    @PostMapping("companyCnt")
+    @ApiOperation("援滇企业数  ")
+    public ResponseVO companyCnt(){
+        return ResponseData.generateCreatedResponse(0,assistCompanyService.companyCnt());
+    }
+
+    @PostMapping("companyProjects")
+    @ApiOperation("企业项目数量  ")
+    public ResponseVO companyProjects(){
+        return ResponseData.generateCreatedResponse(0,assistCompanyService.companyProjects());
+    }
+
+    @PostMapping("oneCompanyProjects")
+    @ApiOperation("查看 某个企业的项目情况  companyId  year")
+    public ResponseVO oneCompanyProjects(@RequestBody OneCompanyProjectsDTO oneCompanyProjectsDTO){
+        return ResponseData.generateCreatedResponse(0,assistCompanyService.oneCompanyProjects(oneCompanyProjectsDTO));
+    }
+
+}

src/main/java/com/laowu/controller/AssistProjectController.java

+package com.laowu.controller;
+
+
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.service.AssistProjectService;
+import com.laowu.util.ResponseData;
+import com.laowu.util.ResponseVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@RestController
+@Api(tags = "就近就业项目")
+@RequestMapping("/assistProject")
+public class AssistProjectController {
+
+    @Autowired
+    private AssistProjectService assistProjectService;
+
+    @PostMapping("projectDetails")
+    @ApiOperation("用工详情  projectId")
+    public ResponseVO  projectDetails(@RequestBody AssistProjectMembersDO assistProjectMembersDO){
+        return ResponseData.generateCreatedResponse(0,assistProjectService.projectDetails(assistProjectMembersDO));
+    }
+
+
+
+}

src/main/java/com/laowu/controller/AssistProjectMembersController.java

+package com.laowu.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@RestController
+@Api(tags = "")
+@RequestMapping("/assistProjectMembers")
+public class AssistProjectMembersController {
+
+}

src/main/java/com/laowu/controller/TransferCompanyController.java

+package com.laowu.controller;
+
+
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.service.TransferCompanyService;
+import com.laowu.util.ResponseData;
+import com.laowu.util.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@RestController
+@Api(tags = "转移就业企业")
+@RequestMapping("/transferCompany")
+public class TransferCompanyController {
+
+
+    @Autowired
+    private TransferCompanyService transferCompanyService;
+
+    @PostMapping("companyCnt")
+    @ApiOperation("援滇企业数  ")
+    public ResponseVO companyCnt(){
+        return ResponseData.generateCreatedResponse(0,transferCompanyService.companyCnt());
+    }
+
+    @PostMapping("companyProjects")
+    @ApiOperation("企业项目数量  ")
+    public ResponseVO companyProjects(){
+        return ResponseData.generateCreatedResponse(0,transferCompanyService.companyProjects());
+    }
+
+    @PostMapping("oneCompanyProjects")
+    @ApiOperation("查看 某个企业的项目情况  companyId  year")
+    public ResponseVO oneCompanyProjects(@RequestBody OneCompanyProjectsDTO oneCompanyProjectsDTO){
+        return ResponseData.generateCreatedResponse(0,transferCompanyService.oneCompanyProjects(oneCompanyProjectsDTO));
+    }
+
+
+}

src/main/java/com/laowu/controller/TransferProjectController.java

+package com.laowu.controller;
+
+
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.service.TransferProjectService;
+import com.laowu.util.ResponseData;
+import com.laowu.util.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@RestController
+@Api(tags = "转移就业项目")
+@RequestMapping("/transferProject")
+public class TransferProjectController {
+
+
+    @Autowired
+    private TransferProjectService transferProjectService;
+
+    @PostMapping("projectDetails")
+    @ApiOperation("用工详情  projectId")
+    public ResponseVO projectDetails(@RequestBody AssistProjectMembersDO assistProjectMembersDO){
+        return ResponseData.generateCreatedResponse(0,transferProjectService.projectDetails(assistProjectMembersDO));
+    }
+}

src/main/java/com/laowu/controller/TransferProjectMembersController.java

+package com.laowu.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@RestController
+@Api(tags = "")
+@RequestMapping("/transferProjectMembers")
+public class TransferProjectMembersController {
+
+}

src/main/java/com/laowu/dto/assist/OneCompanyProjectsDTO.java

+package com.laowu.dto.assist;
+
+import lombok.Data;
+
+@Data
+public class OneCompanyProjectsDTO {
+
+    private Integer year;
+
+    private Long companyId;
+
+}

src/main/java/com/laowu/mapper/AssistCompanyMapper.java

+package com.laowu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.laowu.model.AssistCompanyDO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Repository
+public interface AssistCompanyMapper extends BaseMapper<AssistCompanyDO> {
+
+    List<CompanyProjectsVO> companyProjects();
+
+    List<OneCompanyProjectsVO> oneCompanyProjects(Long companyId,Integer year);
+
+}

src/main/java/com/laowu/mapper/AssistProjectMapper.java

+package com.laowu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.laowu.model.AssistProjectDO;
+import com.laowu.vo.assist.ProjectDetailsVO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Repository
+public interface AssistProjectMapper extends BaseMapper<AssistProjectDO> {
+
+    List<ProjectDetailsVO> projectDetails(Long projectId);
+
+}

src/main/java/com/laowu/mapper/AssistProjectMembersMapper.java

+package com.laowu.mapper;
+
+import com.laowu.model.AssistProjectMembersDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+ @Repository
+public interface AssistProjectMembersMapper extends BaseMapper<AssistProjectMembersDO> {
+
+}

src/main/java/com/laowu/mapper/MemberDictMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.laowu.model.MemberDictDO;
 import com.laowu.model.MemberDictDO;
 import com.laowu.model.PositionDictDO;
 import com.laowu.model.PositionDictDO;
 import com.laowu.vo.member.AllMembersVO;
 import com.laowu.vo.member.AllMembersVO;
+import com.laowu.vo.member.EmployeeAreaCountVO;
 import com.laowu.vo.station.BusinessTop7VO;
 import com.laowu.vo.station.BusinessTop7VO;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
@@ -67,6 +68,11 @@ public interface MemberDictMapper extends BaseMapper<MemberDictDO> {
     List<Double> middleSalary(String province, String city);
     List<Double> middleSalary(String province, String city);
 
 
     /**
     /**
+     * 就业区域占比
+     */
+    List<EmployeeAreaCountVO> employeeAreaCount(String province);
+
+    /**
      * 学历查询
      * 学历查询
      */
      */
     Integer education(String province,String city,String county,String education,String destinationProvince);
     Integer education(String province,String city,String county,String education,String destinationProvince);

src/main/java/com/laowu/mapper/TransferCompanyMapper.java

+package com.laowu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.laowu.model.TransferCompanyDO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+ @Repository
+public interface TransferCompanyMapper extends BaseMapper<TransferCompanyDO> {
+
+ List<CompanyProjectsVO> companyProjects();
+
+ List<OneCompanyProjectsVO> oneCompanyProjects(Long companyId, Integer year);
+
+
+}

src/main/java/com/laowu/mapper/TransferProjectMapper.java

+package com.laowu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.laowu.model.TransferProjectDO;
+import com.laowu.vo.assist.ProjectDetailsVO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Repository
+public interface TransferProjectMapper extends BaseMapper<TransferProjectDO> {
+
+    List<ProjectDetailsVO> projectDetails(Long projectId);
+
+
+}

src/main/java/com/laowu/mapper/TransferProjectMembersMapper.java

+package com.laowu.mapper;
+
+import com.laowu.model.TransferProjectMembersDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+ @Repository
+public interface TransferProjectMembersMapper extends BaseMapper<TransferProjectMembersDO> {
+
+}

src/main/java/com/laowu/model/AssistCompanyDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("assist_company")
+public class AssistCompanyDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * logo
+     */
+    private String logo;
+
+
+}

src/main/java/com/laowu/model/AssistProjectDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("assist_project")
+public class AssistProjectDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Integer companyId;
+
+    private String projectName;
+
+    private String startDate;
+
+    private String endDate;
+
+
+}

src/main/java/com/laowu/model/AssistProjectMembersDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("assist_project_members")
+public class AssistProjectMembersDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long projectId;
+
+    private Long memberId;
+
+    private String startDate;
+
+    private String endDate;
+
+
+}

src/main/java/com/laowu/model/TransferCompanyDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("transfer_company")
+public class TransferCompanyDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * logo
+     */
+    private String logo;
+
+
+}

src/main/java/com/laowu/model/TransferProjectDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("transfer_project")
+public class TransferProjectDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Integer companyId;
+
+    private String projectName;
+
+    private String startDate;
+
+    private String endDate;
+
+
+}

src/main/java/com/laowu/model/TransferProjectMembersDO.java

+package com.laowu.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.laowu.util.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("transfer_project_members")
+public class TransferProjectMembersDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long projectId;
+
+    private Long memberId;
+
+    private String startDate;
+
+    private String endDate;
+
+
+}

src/main/java/com/laowu/service/AssistCompanyService.java

+package com.laowu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.model.AssistCompanyDO;
+import com.laowu.vo.assist.CompanyCntVO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+public interface AssistCompanyService extends IService<AssistCompanyDO> {
+
+    CompanyCntVO companyCnt();
+
+    List<CompanyProjectsVO> companyProjects();
+
+    List<OneCompanyProjectsVO> oneCompanyProjects(OneCompanyProjectsDTO oneCompanyProjectsDTO);
+
+
+}

src/main/java/com/laowu/service/AssistProjectMembersService.java

+package com.laowu.service;
+
+import com.laowu.model.AssistProjectMembersDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+public interface AssistProjectMembersService extends IService<AssistProjectMembersDO> {
+
+}

src/main/java/com/laowu/service/AssistProjectService.java

+package com.laowu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.laowu.model.AssistProjectDO;
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.vo.assist.ProjectDetailsVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+public interface AssistProjectService extends IService<AssistProjectDO> {
+
+    List<ProjectDetailsVO> projectDetails(AssistProjectMembersDO assistProjectMembersDO);
+
+}

src/main/java/com/laowu/service/TransferCompanyService.java

+package com.laowu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.model.TransferCompanyDO;
+import com.laowu.vo.assist.CompanyCntVO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+public interface TransferCompanyService extends IService<TransferCompanyDO> {
+
+    CompanyCntVO companyCnt();
+
+    List<CompanyProjectsVO> companyProjects();
+
+    List<OneCompanyProjectsVO> oneCompanyProjects(OneCompanyProjectsDTO oneCompanyProjectsDTO);
+
+
+}

src/main/java/com/laowu/service/TransferProjectMembersService.java

+package com.laowu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.model.TransferProjectMembersDO;
+import com.laowu.vo.assist.ProjectDetailsVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+public interface TransferProjectMembersService extends IService<TransferProjectMembersDO> {
+
+
+}

src/main/java/com/laowu/service/TransferProjectService.java

+package com.laowu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.model.TransferProjectDO;
+import com.laowu.vo.assist.ProjectDetailsVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+public interface TransferProjectService extends IService<TransferProjectDO> {
+
+    List<ProjectDetailsVO> projectDetails(AssistProjectMembersDO assistProjectMembersDO);
+
+}

src/main/java/com/laowu/service/impl/AssistCompanyServiceImpl.java

+package com.laowu.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.mapper.AssistCompanyMapper;
+import com.laowu.mapper.AssistProjectMapper;
+import com.laowu.mapper.AssistProjectMembersMapper;
+import com.laowu.model.AssistCompanyDO;
+import com.laowu.model.AssistProjectDO;
+import com.laowu.service.AssistCompanyService;
+import com.laowu.vo.assist.CompanyCntVO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Service
+public class AssistCompanyServiceImpl extends ServiceImpl<AssistCompanyMapper, AssistCompanyDO> implements AssistCompanyService {
+
+    @Autowired
+    private AssistProjectMapper assistProjectMapper;
+
+    @Autowired
+    private AssistProjectMembersMapper assistProjectMembersMapper;
+
+    public CompanyCntVO companyCnt() {
+        CompanyCntVO companyCntVO = new CompanyCntVO();
+        Integer count = this.baseMapper.selectCount(null);
+        companyCntVO.setCompanyCnt(count);
+
+        Integer memberCnt = assistProjectMembersMapper.selectCount(null);
+        companyCntVO.setMemberCnt(memberCnt);
+
+        return companyCntVO;
+    }
+
+    public List<CompanyProjectsVO> companyProjects() {
+        List<CompanyProjectsVO> companyProjectsVOS = this.baseMapper.companyProjects();
+        companyProjectsVOS.stream().forEach(x -> {
+            //项目数
+            Integer count = assistProjectMapper.selectCount(new QueryWrapper<AssistProjectDO>()
+                    .lambda()
+                    .eq(AssistProjectDO::getCompanyId, x.getId()));
+            x.setProjectCnt(count);
+        });
+        return companyProjectsVOS;
+    }
+
+    public List<OneCompanyProjectsVO> oneCompanyProjects(OneCompanyProjectsDTO oneCompanyProjectsDTO) {
+
+        return this.baseMapper.oneCompanyProjects(oneCompanyProjectsDTO.getCompanyId(),oneCompanyProjectsDTO.getYear());
+    }
+
+
+}

src/main/java/com/laowu/service/impl/AssistProjectMembersServiceImpl.java

+package com.laowu.service.impl;
+
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.mapper.AssistProjectMembersMapper;
+import com.laowu.service.AssistProjectMembersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Service
+public class AssistProjectMembersServiceImpl extends ServiceImpl<AssistProjectMembersMapper, AssistProjectMembersDO> implements AssistProjectMembersService {
+
+}

src/main/java/com/laowu/service/impl/AssistProjectServiceImpl.java

+package com.laowu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.laowu.mapper.AssistProjectMapper;
+import com.laowu.model.AssistProjectDO;
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.service.AssistProjectService;
+import com.laowu.vo.assist.ProjectDetailsVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-06
+ */
+@Service
+public class AssistProjectServiceImpl extends ServiceImpl<AssistProjectMapper, AssistProjectDO> implements AssistProjectService {
+
+    public List<ProjectDetailsVO> projectDetails(AssistProjectMembersDO assistProjectMembersDO) {
+        return this.baseMapper.projectDetails(assistProjectMembersDO.getProjectId());
+    }
+
+}

src/main/java/com/laowu/service/impl/TransferCompanyServiceImpl.java

+package com.laowu.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.laowu.dto.assist.OneCompanyProjectsDTO;
+import com.laowu.mapper.TransferCompanyMapper;
+import com.laowu.mapper.TransferProjectMapper;
+import com.laowu.mapper.TransferProjectMembersMapper;
+import com.laowu.model.TransferCompanyDO;
+import com.laowu.model.TransferProjectDO;
+import com.laowu.service.TransferCompanyService;
+import com.laowu.vo.assist.CompanyCntVO;
+import com.laowu.vo.assist.CompanyProjectsVO;
+import com.laowu.vo.assist.OneCompanyProjectsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Service
+public class TransferCompanyServiceImpl extends ServiceImpl<TransferCompanyMapper, TransferCompanyDO> implements TransferCompanyService {
+
+    @Autowired
+    private TransferProjectMapper transferProjectMapper;
+
+    @Autowired
+    private TransferProjectMembersMapper transferProjectMembersMapper;
+
+    public CompanyCntVO companyCnt() {
+        CompanyCntVO companyCntVO = new CompanyCntVO();
+        Integer count = this.baseMapper.selectCount(null);
+        companyCntVO.setCompanyCnt(count);
+
+        Integer memberCnt = transferProjectMembersMapper.selectCount(null);
+        companyCntVO.setMemberCnt(memberCnt);
+
+        return companyCntVO;
+    }
+
+    public List<CompanyProjectsVO> companyProjects() {
+        List<CompanyProjectsVO> companyProjectsVOS = this.baseMapper.companyProjects();
+        companyProjectsVOS.stream().forEach(x -> {
+            //项目数
+            Integer count = transferProjectMapper.selectCount(new QueryWrapper<TransferProjectDO>()
+                    .lambda()
+                    .eq(TransferProjectDO::getCompanyId, x.getId()));
+            x.setProjectCnt(count);
+        });
+        return companyProjectsVOS;
+    }
+
+    public List<OneCompanyProjectsVO> oneCompanyProjects(OneCompanyProjectsDTO oneCompanyProjectsDTO) {
+
+        return this.baseMapper.oneCompanyProjects(oneCompanyProjectsDTO.getCompanyId(),oneCompanyProjectsDTO.getYear());
+    }
+
+
+}

src/main/java/com/laowu/service/impl/TransferProjectMembersServiceImpl.java

+package com.laowu.service.impl;
+
+import com.laowu.model.TransferProjectMembersDO;
+import com.laowu.mapper.TransferProjectMembersMapper;
+import com.laowu.service.TransferProjectMembersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Service
+public class TransferProjectMembersServiceImpl extends ServiceImpl<TransferProjectMembersMapper, TransferProjectMembersDO> implements TransferProjectMembersService {
+
+}

src/main/java/com/laowu/service/impl/TransferProjectServiceImpl.java

+package com.laowu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.laowu.mapper.TransferProjectMapper;
+import com.laowu.model.AssistProjectMembersDO;
+import com.laowu.model.TransferProjectDO;
+import com.laowu.service.TransferProjectService;
+import com.laowu.vo.assist.ProjectDetailsVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Tuyp
+ * @since 2023-09-11
+ */
+@Service
+public class TransferProjectServiceImpl extends ServiceImpl<TransferProjectMapper, TransferProjectDO> implements TransferProjectService {
+
+    public List<ProjectDetailsVO> projectDetails(AssistProjectMembersDO assistProjectMembersDO) {
+        return this.baseMapper.projectDetails(assistProjectMembersDO.getProjectId());
+    }
+
+}

src/main/java/com/laowu/service/impl/WorkstationDictServiceImpl.java

@@ -14,6 +14,7 @@ import com.laowu.model.*;
 import com.laowu.service.WorkstationDictService;
 import com.laowu.service.WorkstationDictService;
 import com.laowu.util.ConstantUtils;
 import com.laowu.util.ConstantUtils;
 import com.laowu.util.MathUtil;
 import com.laowu.util.MathUtil;
+import com.laowu.vo.member.EmployeeAreaCountVO;
 import com.laowu.vo.station.*;
 import com.laowu.vo.station.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -234,7 +235,6 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe
         //市总人数
         //市总人数
         int count = memberDictMapper.selectCount(new QueryWrapper<MemberDictDO>()
         int count = memberDictMapper.selectCount(new QueryWrapper<MemberDictDO>()
                 .lambda()
                 .lambda()
-                .eq(MemberDictDO::getProvince, libGeoLocationDO.getProvince())
                 .eq(MemberDictDO::getCity, libGeoLocationDO.getCity()));
                 .eq(MemberDictDO::getCity, libGeoLocationDO.getCity()));
 
 
         //市/县劳动能力总数
         //市/县劳动能力总数
@@ -301,8 +301,9 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe
             screen2VO.setMiddleSalary(0.00);
             screen2VO.setMiddleSalary(0.00);
         }
         }
 
 
-        //区域
-
+        //区域占比
+        List<EmployeeAreaCountVO> employeeAreaCountVOS = memberDictMapper.employeeAreaCount("上海市");
+        screen2VO.setEmployeeAreaCountVOS(employeeAreaCountVOS);
 //        //学历情况:初中学历，高中学历，大专及以上，其他
 //        //学历情况:初中学历，高中学历，大专及以上，其他
 //        //初中学历
 //        //初中学历
 //        Integer chuzhongCnt = memberDictMapper.education(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), null, "初中", "上海市");
 //        Integer chuzhongCnt = memberDictMapper.education(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), null, "初中", "上海市");

src/main/java/com/laowu/vo/assist/CompanyCntVO.java

+package com.laowu.vo.assist;
+
+import lombok.Data;
+
+@Data
+public class CompanyCntVO {
+
+    private Integer companyCnt;
+
+    private Integer memberCnt;
+
+}

src/main/java/com/laowu/vo/assist/CompanyProjectsVO.java

+package com.laowu.vo.assist;
+
+import lombok.Data;
+
+@Data
+public class CompanyProjectsVO {
+
+    private Long id;
+
+    private String companyName;
+
+    private String logo;
+
+    private Integer projectCnt;
+
+    private Integer memberCnt;
+
+
+}

src/main/java/com/laowu/vo/assist/MemberCntVO.java

+package com.laowu.vo.assist;
+
+import lombok.Data;
+
+@Data
+public class MemberCntVO {
+
+    private Integer memberCount;
+
+}

src/main/java/com/laowu/vo/assist/OneCompanyProjectsVO.java

+package com.laowu.vo.assist;
+
+import lombok.Data;
+
+@Data
+public class OneCompanyProjectsVO {
+
+    private Long id;
+
+    private String companyName;
+
+    private String logo;
+
+    private String projectName;
+
+    private Integer memberCnt;
+
+    private String startDate;
+
+    private String endDate;
+}

src/main/java/com/laowu/vo/assist/ProjectDetailsVO.java

+package com.laowu.vo.assist;
+
+import lombok.Data;
+
+@Data
+public class ProjectDetailsVO {
+
+    private Long id;
+
+    private String userName;
+
+    private String startDate;
+
+    private String endDate;
+
+
+}

src/main/java/com/laowu/vo/member/EmployeeAreaCountVO.java

+package com.laowu.vo.member;
+
+import lombok.Data;
+
+@Data
+public class EmployeeAreaCountVO {
+
+    private String provinceNow;
+
+    private String cityNow;
+
+    private String countyNow;
+
+    private Integer cnt;
+
+}

src/main/java/com/laowu/vo/station/Screen2VO.java

 package com.laowu.vo.station;
 package com.laowu.vo.station;
 
 
+import com.laowu.vo.member.EmployeeAreaCountVO;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
@@ -21,18 +22,20 @@ public class Screen2VO {
 
 
     private Integer chuzhongCnt;
     private Integer chuzhongCnt;
 
 
-//    private String chuzhongPercent;
-
-    private Integer gaozhongCnt;
-
-//    private String  gaozhongPercent;
-
-    private Integer daxueCnt;
-
-//    private String daxuePercent;
-
-    private Integer otherCnt;
-
-//    private String otherPercent;
+////    private String chuzhongPercent;
+//
+//    private Integer gaozhongCnt;
+//
+////    private String  gaozhongPercent;
+//
+//    private Integer daxueCnt;
+//
+////    private String daxuePercent;
+//
+//    private Integer otherCnt;
+//
+////    private String otherPercent;
+
+    private List<EmployeeAreaCountVO> employeeAreaCountVOS;
 
 
 }
 }

src/main/resources/mapper/AssistCompanyMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.AssistCompanyMapper">
+
+  <select id="companyProjects" resultType="com.laowu.vo.assist.CompanyProjectsVO">
+        SELECT
+            t.id,
+            t.company_name,
+            t.logo,
+            count( t3.member_id ) AS memberCnt
+        FROM
+            assist_company t
+            LEFT JOIN assist_project t2 ON t.id = t2.company_id
+            LEFT JOIN assist_project_members t3 ON t2.id = t3.project_id
+        WHERE
+            t.delete_date IS NULL
+            AND t2.delete_date IS NULL
+        GROUP BY
+            t.id,
+            t.company_name,
+            t.logo
+  </select>
+
+    <select id="oneCompanyProjects" resultType="com.laowu.vo.assist.OneCompanyProjectsVO">
+        SELECT
+        t2.id,
+        t.company_name,
+        t.logo,
+        t2.project_name,
+        count( t3.member_id ) AS memberCnt,
+        t2.start_date,
+        t2.end_date
+        FROM
+        assist_company t
+        LEFT JOIN assist_project t2 ON t.id = t2.company_id
+        LEFT JOIN assist_project_members t3 ON t2.id = t3.project_id
+        WHERE
+        t.delete_date IS NULL
+        AND t2.delete_date IS NULL
+        AND t3.delete_date IS NULL
+        <if test="year != null and year != ''">
+            AND DATE_FORMAT( t2.start_date, '%Y' ) &lt;= #{year}
+            AND DATE_FORMAT( t2.end_date, '%Y' )>=#{year}
+        </if>
+        and t.id = #{companyId}
+        GROUP BY
+        t2.id,
+        t.company_name,
+        t.logo,
+        t2.project_name,
+        t2.start_date,
+        t2.end_date
+    </select>
+</mapper>

src/main/resources/mapper/AssistProjectMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.AssistProjectMapper">
+
+    <select id="projectDetails" parameterType="long" resultType="com.laowu.vo.assist.ProjectDetailsVO">
+        SELECT
+            t2.id,
+            t2.user_name,
+            t.start_date,
+            t.end_date
+        FROM
+            assist_project_members t
+            LEFT JOIN member_dict t2 ON t.member_id = t2.id
+        WHERE
+            t.delete_date IS NULL
+            AND t2.delete_date IS NULL
+            AND t.project_id = #{projectId}
+    </select>
+</mapper>

src/main/resources/mapper/AssistProjectMembersMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.AssistProjectMembersMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.laowu.model.AssistProjectMembersDO">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="update_date" property="updateDate" />
+        <result column="delete_date" property="deleteDate" />
+        <result column="project_id" property="projectId" />
+        <result column="member_id" property="memberId" />
+        <result column="start_date" property="startDate" />
+        <result column="end_date" property="endDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        create_date,
+        update_date,
+        delete_date,
+        id, project_id, member_id, start_date, end_date
+    </sql>
+
+</mapper>

src/main/resources/mapper/LibGeoLocationMapper.xml

@@ -51,7 +51,9 @@
         WHERE
         WHERE
             t.delete_date IS NULL
             t.delete_date IS NULL
             AND t.county IS NOT NULL
             AND t.county IS NOT NULL
+        <if test="province != null and province != ''">
             AND t.province = #{province}
             AND t.province = #{province}
+        </if>
                     AND t.city = #{city}
                     AND t.city = #{city}
     </select>
     </select>
 
 

src/main/resources/mapper/MemberDictMapper.xml

@@ -82,7 +82,9 @@
         WHERE
         WHERE
             t.delete_date IS NULL
             t.delete_date IS NULL
             AND t.labor_ability IN ( '技能劳动力', '普通劳动力', '部分丧失劳动力' )
             AND t.labor_ability IN ( '技能劳动力', '普通劳动力', '部分丧失劳动力' )
+            <if test="province != null and province != ''">
                 AND t.province = #{province}
                 AND t.province = #{province}
+            </if>
             AND t.city = #{city}
             AND t.city = #{city}
             <if test="county != null and county != ''">
             <if test="county != null and county != ''">
                 and t.county = #{county}
                 and t.county = #{county}
@@ -101,7 +103,9 @@
             t.delete_date IS NULL
             t.delete_date IS NULL
             AND ( t.province_now = '上海市'
             AND ( t.province_now = '上海市'
                     OR t.province_employment = '上海市')
                     OR t.province_employment = '上海市')
-                and t.province = #{province}
+        <if test="province != null and province != ''">
+            AND t.province = #{province}
+        </if>
                         AND t.city = #{city}
                         AND t.city = #{city}
     </select>
     </select>
 
 
@@ -115,7 +119,9 @@
             and t.is_migration = #{isMigration}
             and t.is_migration = #{isMigration}
             AND ( t.province_now = '上海市'
             AND ( t.province_now = '上海市'
                     OR t.province_employment = '上海市')
                     OR t.province_employment = '上海市')
-                and t.province = #{province}
+        <if test="province != null and province != ''">
+            AND t.province = #{province}
+        </if>
                         AND t.city = #{city}
                         AND t.city = #{city}
     </select>
     </select>
 
 
@@ -130,7 +136,9 @@
             AND t2.member_id IS NOT NULL
             AND t2.member_id IS NOT NULL
             AND ( t.province_now = '上海市'
             AND ( t.province_now = '上海市'
                     OR t.province_employment = '上海市')
                     OR t.province_employment = '上海市')
-                and t.province = #{province}
+        <if test="province != null and province != ''">
+            AND t.province = #{province}
+        </if>
                 AND t.city = #{city}
                 AND t.city = #{city}
     </select>
     </select>
 
 
@@ -146,7 +154,9 @@
             AND t.business_id IS NOT NULL
             AND t.business_id IS NOT NULL
             AND t.business_id = 5
             AND t.business_id = 5
             AND ( t.province_now = '上海市' OR t.province_employment = '上海市')
             AND ( t.province_now = '上海市' OR t.province_employment = '上海市')
-            and t.province = #{province}
+            <if test="province != null and province != ''">
+                AND t.province = #{province}
+            </if>
             AND t.city = #{city}
             AND t.city = #{city}
                 UNION
                 UNION
         SELECT
         SELECT
@@ -184,12 +194,31 @@
             t.delete_date IS NULL
             t.delete_date IS NULL
             AND ( t.province_now = '上海市'
             AND ( t.province_now = '上海市'
                     OR t.province_employment = '上海市')
                     OR t.province_employment = '上海市')
-                and t.province = #{province}
+        <if test="province != null and province != ''">
+            AND t.province = #{province}
+        </if>
                         AND t.city = #{city}
                         AND t.city = #{city}
         ORDER BY
         ORDER BY
             t.average_salary
             t.average_salary
     </select>
     </select>
 
 
+    <select id="employeeAreaCount" parameterType="string" resultType="com.laowu.vo.member.EmployeeAreaCountVO">
+        SELECT
+            t.province_now,
+            t.city_now,
+            t.county_now,
+            count( 1 ) as cnt
+        FROM
+            member_dict t
+        WHERE
+            t.delete_date IS NULL
+            and t.province_now = #{province}
+        GROUP BY
+            t.province_now,
+            t.city_now,
+            t.county_now
+    </select>
+
     <select id="education" resultType="integer">
     <select id="education" resultType="integer">
         SELECT
         SELECT
             count( 1 )
             count( 1 )
@@ -202,8 +231,9 @@
             AND ( t.province_now = #{destinationProvince}
             AND ( t.province_now = #{destinationProvince}
             OR t.province_employment = #{destinationProvince})
             OR t.province_employment = #{destinationProvince})
         </if>
         </if>
-        and t.province = #{province}
-        AND t.city = #{city}
+        <if test="province != null and province != ''">
+            AND t.province = #{province}
+        </if>        AND t.city = #{city}
             <if test="county != null and county != ''">
             <if test="county != null and county != ''">
                 and t.county = #{county}
                 and t.county = #{county}
             </if>
             </if>
@@ -216,8 +246,9 @@
             member_dict t
             member_dict t
         WHERE
         WHERE
             t.delete_date IS NULL
             t.delete_date IS NULL
+        <if test="province != null and province != ''">
             AND t.province = #{province}
             AND t.province = #{province}
-            AND t.city = #{city}
+        </if>            AND t.city = #{city}
             <if test="county != null and county != ''">
             <if test="county != null and county != ''">
                 and t.county = #{county}
                 and t.county = #{county}
             </if>
             </if>

src/main/resources/mapper/TransferCompanyMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.TransferCompanyMapper">
+
+
+    <select id="companyProjects" resultType="com.laowu.vo.assist.CompanyProjectsVO">
+        SELECT
+            t.id,
+            t.company_name,
+            t.logo,
+            count( t3.member_id ) AS memberCnt
+        FROM
+            transfer_company t
+            LEFT JOIN transfer_project t2 ON t.id = t2.company_id
+            LEFT JOIN transfer_project_members t3 ON t2.id = t3.project_id
+        WHERE
+            t.delete_date IS NULL
+            AND t2.delete_date IS NULL
+        GROUP BY
+            t.id,
+            t.company_name,
+            t.logo
+  </select>
+
+    <select id="oneCompanyProjects" resultType="com.laowu.vo.assist.OneCompanyProjectsVO">
+        SELECT
+        t2.id,
+        t.company_name,
+        t.logo,
+        t2.project_name,
+        count( t3.member_id ) AS memberCnt,
+        t2.start_date,
+        t2.end_date
+        FROM
+        transfer_company t
+        LEFT JOIN transfer_project t2 ON t.id = t2.company_id
+        LEFT JOIN transfer_project_members t3 ON t2.id = t3.project_id
+        WHERE
+        t.delete_date IS NULL
+        AND t2.delete_date IS NULL
+        AND t3.delete_date IS NULL
+        <if test="year != null and year != ''">
+            AND DATE_FORMAT( t2.start_date, '%Y' ) &lt;= #{year}
+            AND DATE_FORMAT( t2.end_date, '%Y' )>=#{year}
+        </if>
+        and t.id = #{companyId}
+        GROUP BY
+        t2.id,
+        t.company_name,
+        t.logo,
+        t2.project_name,
+        t2.start_date,
+        t2.end_date
+    </select>
+</mapper>

src/main/resources/mapper/TransferProjectMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.TransferProjectMapper">
+
+    <select id="projectDetails" parameterType="long" resultType="com.laowu.vo.assist.ProjectDetailsVO">
+        SELECT
+            t2.id,
+            t2.user_name,
+            t.start_date,
+            t.end_date
+        FROM
+            transfer_project_members t
+            LEFT JOIN member_dict t2 ON t.member_id = t2.id
+        WHERE
+            t.delete_date IS NULL
+            AND t2.delete_date IS NULL
+            AND t.project_id = #{projectId}
+    </select>
+
+</mapper>

src/main/resources/mapper/TransferProjectMembersMapper.xml

+<?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">
+<mapper namespace="com.laowu.mapper.TransferProjectMembersMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.laowu.model.TransferProjectMembersDO">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="update_date" property="updateDate" />
+        <result column="delete_date" property="deleteDate" />
+        <result column="project_id" property="projectId" />
+        <result column="member_id" property="memberId" />
+        <result column="start_date" property="startDate" />
+        <result column="end_date" property="endDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        create_date,
+        update_date,
+        delete_date,
+        id, project_id, member_id, start_date, end_date
+    </sql>
+
+</mapper>