Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!5

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
-import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -101,13 +101,13 @@ public class DzhtController2 {
 			String name = yg.getName();
 			Integer type = yg.getZjType();
 			String idType = null;
-			if (type == 1) {
+			if (type == 0) {
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
-			} else if (type == 2) {
+			} else if (type == 1) {
 				idType = "CRED_PSN_CH_HONGKONG";// 香港通行证
-			} else if (type == 3) {
+			} else if (type == 2) {
 				idType = "CRED_PSN_CH_TWCARD";// 台湾通行证
-			} else if (type == 4) {
+			} else if (type == 3) {
 				idType = "CRED_PSN_FOREIGN";// 外籍护照
 			}
 			String idNumber = yg.getZjNum();

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -158,7 +158,9 @@ public class CmsController {
 	@ApiOperation(value = "获取分类", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getxxfl(@CurrentUser UserBean userBean) {
 		return ResultUtil.data(CmsContentModular.builder().build().selectList(
-				new QueryWrapper<CmsContentModular>().eq("organization_id", userBean.getOrgCode()).eq("is_open", 0)),
+				new QueryWrapper<CmsContentModular>()
+//				.eq("organization_id", userBean.getOrgCode())
+				.eq("is_open", 0)),
 				"查询分类成功！");
 	}
 
@@ -293,11 +295,15 @@ public class CmsController {
 				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
 
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 1).eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
+		queryWrapper
+			.eq("organization_id", userBean.getOrgCode())
+			.eq("status", 1).eq(t != null && t > -1, "modularid", t)
+			.eq(r != null && r > -1, "releasestate", r)
 			.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
 						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
 						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
-				.and(!StrUtil.hasBlank(q), wq -> wq.like("userid", q).or().like("author", q).or().like("title", q))
+			.and(!StrUtil.hasBlank(q), wq -> wq.like("userid", q)
+			.or().like("author", q).or().like("title", q))
 			.orderByDesc("addeddate");
 		IPage<CmsContent> cmsContentPage = CmsContent.builder().build().selectPage(page, queryWrapper);
 		List<CmsContent> cmsContents = cmsContentPage.getRecords();
@@ -347,6 +353,7 @@ public class CmsController {
 		// 查询条件
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		queryWrapper
+				.eq("organization_id", userBean.getOrgCode())
 				.select("id", "auditopinion", "modularid", "status", "title", "releasetime", "addeddate", "author",
 						"summary", "releasetype", "fmtpath")
 				.ne("status", 1).eq(t != null && t > -1, "modularid", t)

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
 
 import javax.transaction.Transactional;
 
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,7 +34,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
-import com.github.pagehelper.util.StringUtil;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -56,7 +53,6 @@ import cn.timer.api.bean.yggl.YgglAttaZcxxb;
 import cn.timer.api.bean.yggl.YgglAttaZszjb;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainLzb;
-import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
@@ -71,18 +67,17 @@ import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.yggl.AddygdaDto;
-import cn.timer.api.dto.yggl.IYgjgDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
-import cn.timer.api.dto.yggl.PunishFactory;
 import cn.timer.api.dto.yggl.YgAreaDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 import cn.timer.api.dto.yggl.YgDrsDto;
+import cn.timer.api.dto.yggl.YgProDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgjgDto;
-import cn.timer.api.dto.yggl.YgProDto;
+import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;
@@ -1009,25 +1004,34 @@ public class YgglController {
 	@ApiOperation(value = "员工搜索/分页", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 52)
 	public Result<Object> ygquery(@CurrentUser UserBean userBean, @RequestBody YgQueryDto ygQueryDto) {
+		Integer orgCode = userBean.getOrgCode();
 		Integer b = ygQueryDto.getBmgwid();
+		ArrayList<Integer> bList = new ArrayList<Integer>();
+		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
+				.eq(ZzglBmgwM::getOrgCode, orgCode).list();
+		ZzglBmgwM.getDepts(bList, b, zzglBmgwMs);
+
 		Integer j = ygQueryDto.getJobStatus();
 		Integer t = ygQueryDto.getJobType();
 		String q = ygQueryDto.getQuery();
 		Page<YgglMainEmp> page = new Page<YgglMainEmp>(
 				ygQueryDto.getCurrentPage() == null ? 1 : ygQueryDto.getCurrentPage(),
 				ygQueryDto.getTotalPage() == null ? 10 : ygQueryDto.getTotalPage());
-
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_code", userBean.getOrgCode()).eq(t != null && t > -1, "job_type", t)
-				.eq(b != null && b > -1, "bmgw_id", b).eq(j != null && j > -1, "job_status", j)
-				.and(!StrUtil.hasBlank(q), wq -> wq.likeRight("name", q).or().likeRight("phone", q));
+		queryWrapper.
+		select("name","emp_num","bmgw_id","rz_time","job_type","phone","job_status")
+		.eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
+				.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "id", bList)
+				.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q));
+//		List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
 		IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper);
-		List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
+		// List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
 		ygglMainEmpPage.getCurrent();
 		ygglMainEmpPage.getPages();
 		ygglMainEmpPage.getTotal();
 		ygglMainEmpPage.getSize();
-		return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功");
+		return ResultUtil.data(ygglMainEmpPage, "员工搜索成功");
+		// return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功");
 	}
 
 	/**

src/main/java/cn/timer/api/dao/yggl/YgCityDtoMapper.java

@@ -4,7 +4,6 @@ import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.dto.yggl.YgCityDto;
-import cn.timer.api.dto.yggl.YgProDto;
 
 
 

src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java

@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/timer/api/dto/yggl/YgCityDto.java

@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/timer/api/dto/yggl/YgProDto.java

@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/timer/api/dto/yggl/YgmzDto.java

@@ -3,7 +3,6 @@ package cn.timer.api.dto.yggl;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/resources/application-pro.yml

@@ -10,26 +10,28 @@ spring:
     multipart: 
       max-file-size: 20MB  
       max-request-size: 20MB
-  # jpa:
+  jpa:
     # 配置生成表 存储引擎InnoDB
     # database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
       # database: 
       # open-in-view: false
-      #naming: 
+      # naming: 
       # spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
       # 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
       # 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-      #physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # hibernate: 
-      # ddl-auto: update
-    # show-sql: true
+      # physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+    hibernate: 
+      ddl-auto: update
+    show-sql: true
   datasource:
-    username: root
-    password: youlingHR73!
+    # username: root
+    # password: youlingHR73!
+    username: youling8timer
+    password: (!0YouLing8Timer0!)
     # username: tang
     # password: Tang123456!
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
-    url: jdbc:mysql://114.115.168.73:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://120.24.24.239:3306/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -114,7 +116,7 @@ pagehelper:
 #showSql
 logging:
   level:
-    root: debug
+    root: info
     cn.timer.api.dao: error
   pattern:
     console: '--%p--%m%n'