Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
+    Page<JyjcOpeningApplicationDto> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
+                                                                     @Param("jyjcOpeningApplicationDto") JyjcOpeningApplicationDto jyjcOpeningApplicationDto);
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -2,4 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper">
 
+
+    <select id="selectJyjcOpeningApplicationList"
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto">
+        select
+        unit_code,
+        detection_region,
+        detection_region_name,
+        application_seq,
+        result_type,
+        expiry_date,
+        accept_date,
+        `status`,
+        remark,
+        sequence_nbr,
+        rec_date,
+        rec_user_id,
+        rec_user_name,
+        apply_time
+        from tz_jyjc_opening_application
+        <where>
+            <if test="jyjcOpeningApplicationDto.applicationSeq != '' and jyjcOpeningApplicationDto.applicationSeq != null">
+                and apply_no like concat('%',#{jyjcOpeningApplicationDto.applicationSeq},'%')
+            </if>
+            <if test="jyjcOpeningApplicationDto.unitCode != '' and jyjcOpeningApplicationDto.unitCode != null">
+                and apply_no like concat('%',#{jyjcOpeningApplicationDto.unitCode},'%')
+            </if>
+            <if test="jyjcOpeningApplicationDto.accept_date != '' and jyjcOpeningApplicationDto.accept_date != null">
+                and apply_no like concat('%',#{jyjcOpeningApplicationDto.accept_date},'%')
+            </if>
+            <if test="jyjcOpeningApplicationDto.status != '' and jyjcOpeningApplicationDto.status != null">
+                and apply_no like concat('%',#{jyjcOpeningApplicationDto.status},'%')
+            </if>
+            <if test="jyjcOpeningApplicationDto.applyTime != '' and jyjcOpeningApplicationDto.applyTime != null">
+                and apply_no like concat('%',#{jyjcOpeningApplicationDto.applyTime},'%')
+            </if>
+        </where>
+
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -94,11 +95,11 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<JyjcOpeningApplicationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JyjcOpeningApplicationDto> page = new Page<JyjcOpeningApplicationDto>();
+                    (value = "size") int size,JyjcOpeningApplicationDto jyjcOpeningApplicationDto) {
+	    Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page));
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,9 +20,16 @@ import java.util.List;
  */
 @Service
 public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningApplicationDto,JyjcOpeningApplication,JyjcOpeningApplicationMapper> implements IJyjcOpeningApplicationService {
+    @Autowired
+    CommonserviceImpl commonserviceImpl;
+
+    @Autowired
+    JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
+
     /**
      * 分页查询
      */
+
     public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplicationDto> page)   {
         return this.queryForPage(page, null, false);
     }
@@ -30,4 +40,13 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     public List<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationList()   {
         return this.queryForList("" , false);
     }
+    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page,JyjcOpeningApplicationDto jyjcOpeningApplicationDto)   {
+        //根据申请单中的单位信息对于列表数据进行过滤
+         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
+        if(companyBo.getLevel().equals("company")){
+            jyjcOpeningApplicationDto.setUnitCode(companyBo.getCompanyCode());
+        }
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page,jyjcOpeningApplicationDto);
+    }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-common/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/JyjcOpeningApplicationDto.java

@@ -49,4 +49,7 @@ public class JyjcOpeningApplicationDto  extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "申请时间")
+     private String applyTime;
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-common/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

 package com.yeejoin.amos.boot.module.jyjc.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -77,4 +78,10 @@ public class JyjcOpeningApplication extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 申请时间
+     */
+    @TableField(value = "rec_date", fill = FieldFill.INSERT)
+    protected Date applyTime;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -16,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="BaseUnitLicenceDto", description="单位注册许可信息表")
-public class BaseUnitLicenceDto  extends BaseDto {
+@ApiModel(value = "BaseUnitLicenceDto", description = "单位注册许可信息表")
+public class BaseUnitLicenceDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "单位编码")
@@ -37,7 +38,7 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "证书类型code")
     private String certTypeCode;
 
-    @ApiModelProperty(value = "证书编号")
+    @ApiModelProperty(value = "证书编号(核准证编号)")
     private String certNo;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -67,10 +68,10 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码（核准项目代码）")
     private String itemCode;
 
-    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种（核准项目名称）")
     private String itemCodeName;
 
     @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
@@ -97,4 +98,13 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "是否同步自许可（1是 0否）")
     private String isNotSync;
 
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/BaseUnitLicence.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,7 +57,7 @@ public class BaseUnitLicence extends BaseEntity {
     private String certTypeCode;
 
     /**
-     * 证书编号
+     * 证书编号(核准证编号)
      */
 	@TableField("cert_no")
     private String certNo;
@@ -112,13 +113,13 @@ public class BaseUnitLicence extends BaseEntity {
     private String remark;
 
     /**
-     * 许可项目/检验类型/设备品种编码
+     * 许可项目/检验类型/设备品种编码（核准项目代码）
      */
 	@TableField("item_code")
     private String itemCode;
 
     /**
-     * 许可项目/检验类型/设备品种
+     * 许可项目/检验类型/设备品种（核准项目名称）
      */
 	@TableField("item_code_name")
     private String itemCodeName;
@@ -170,4 +171,14 @@ public class BaseUnitLicence extends BaseEntity {
     @TableField("is_not_sync")
     private String isNotSync;
 
+
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeCode;
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
 }