fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyCertificateAddBo.java

@@ -60,10 +60,10 @@ public class CompanyCertificateAddBo {
     private Long effectiveDate;
     /** 有效日期 1：长期 */
     @ApiModelProperty("有效日期是否长期")
-    private int effectiveFlag;
+    private Integer effectiveFlag;
     /** 有效日期 1：长期 */
     @ApiModelProperty("营业时间是否长期")
-    private int operateFlag;
+    private Integer operateFlag;
     /** 资质证书信息 */
     @ApiModelProperty("资质证书信息")
     private String text;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyCertificateEditBo.java

@@ -47,10 +47,10 @@ public class CompanyCertificateEditBo {
     private String previewImg;
     /** 有效日期 1：长期 */
     @ApiModelProperty("有效日期是否长期")
-    private int effectiveFlag;
+    private Integer effectiveFlag;
     /** 有效日期 1：长期 */
     @ApiModelProperty("营业时间是否长期")
-    private int operateFlag;
+    private Integer operateFlag;
     /** 1有效 0无效 */
     @ApiModelProperty("1有效 0无效")
     private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyCertificateQueryBo.java

@@ -37,10 +37,10 @@ public class CompanyCertificateQueryBo extends BaseEntity {
 	private String isAsc;
 	/** 有效日期 1：长期 */
 	@ApiModelProperty("有效日期是否长期")
-	private int effectiveFlag;
+	private Integer effectiveFlag;
 	/** 有效日期 1：长期 */
 	@ApiModelProperty("营业时间是否长期")
-	private int operateFlag;
+	private Integer operateFlag;
 	@ApiModelProperty("机构名称")
 	private String tenantId;
 	/** 公司id */
@@ -112,4 +112,5 @@ public class CompanyCertificateQueryBo extends BaseEntity {
 	/** 企业证书备注 */
 	@ApiModelProperty("企业证书备注")
 	private String companyCertificateRemarks;
+	private String searchItem;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/domain/CompanyCertificate.java

@@ -63,9 +63,9 @@ public class CompanyCertificate implements Serializable {
      * 有效日期
      */
     /** 有效日期 1：长期 */
-    private int effectiveFlag;
+    private Integer effectiveFlag;
     /** 有效日期 1：长期 */
-    private int operateFlag;
+    private Integer operateFlag;
     private Long effectiveDate;
     /**
      * 预警状态 1：正常 2：已过期

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyCertificateServiceImpl.java

@@ -55,26 +55,45 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                 String companyTypeNameByType = getCompanyTypeNameByType(item.getCompanyType());
                 item.setCompanyTypeName(companyTypeNameByType);
             }
-            if (ObjectUtil.isAllNotEmpty(item.getEffectiveDate(), item.getIssuanceDate())) {
+            CompanyCertificate companyCertificate = new CompanyCertificate();
+            companyCertificate.setCertificateId(item.getCertificateId());
+            companyCertificate.setUpdateTime(DateUtils.getNowTime());
+            if (ObjectUtil.isNotEmpty(item.getEffectiveDate())&&item.getEffectiveDate()!=0) {
                 Date effectivedate = new Date(item.getEffectiveDate() * 1000L);
                 if (effectivedate.compareTo(new Date()) > 0) {
                     item.setExpirationTime(0L);
                     item.setWarningStatus(1);
                 } else {
                     //查询实时证书过期时间更新证书预警状态
-                    CompanyCertificate companyCertificate = new CompanyCertificate();
-                    companyCertificate.setUpdateTime(DateUtils.getNowTime());
                     companyCertificate.setWarningStatus(2);
-                    companyCertificate.setCertificateId(item.getCertificateId());
                     this.baseMapper.updateById(companyCertificate);
-                    long l = DateUtil.between(effectivedate, new Date(), DateUnit.DAY);
-                    item.setWarningStatus(2);
-                    item.setExpirationTime(l);
+                    if (ObjectUtil.isNotEmpty(item.getEffectiveDate())){
+                        long l = DateUtil.between(effectivedate, new Date(), DateUnit.DAY);
+                        item.setExpirationTime(l);
+                        item.setWarningStatus(2);
+                    }
                 }
             }
-            if (ObjectUtil.isNotEmpty(item.getEffectiveFlag())&&item.getEffectiveFlag()==1){
+            if (ObjectUtil.isNotEmpty(item.getOperateDate())&&item.getOperateDate()!=0) {
+                Date opearteDate = new Date(item.getOperateDate() * 1000L);
+                if (opearteDate.compareTo(new Date()) > 0) {
+                    item.setExpirationTime(0L);
+                    companyCertificate.setWarningStatus(1);
+                } else {
+                    //查询实时证书过期时间更新证书预警状态
+                    companyCertificate.setWarningStatus(2);
+                    if (ObjectUtil.isNotEmpty(item.getOperateDate())){
+                        long l = DateUtil.between(opearteDate, new Date(), DateUnit.DAY);
+                        item.setExpirationTime(l);
+                        item.setWarningStatus(2);
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(item.getEffectiveFlag())&&item.getEffectiveFlag()==1||ObjectUtil.isNotEmpty(item.getOperateDate())&&item.getOperateFlag()==1){
                 item.setWarningStatus(1);
+                companyCertificate.setWarningStatus(1);
             }
+            this.baseMapper.updateById(companyCertificate);
         });
         return companyCertificateVos;
     }
@@ -310,7 +329,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             }
                             if (ObjectUtil.isNotEmpty(item.getOperateDateName())) {
                                 if (item.getOperateDateName().equals("长期")) {
-                                    companyCertificate.setOperateDate(1L);
+                                    companyCertificate.setOperateFlag(1);
                                 } else {
                                     String operateDateName = item.getOperateDateName();
                                     Long operateDate = DateUtils.dateTimeSec("yyyy/MM/dd", operateDateName);
@@ -361,7 +380,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                     }
                     if (ObjectUtil.isNotEmpty(excelCompanyCertificateVo.getEffectiveDateName())) {
                         if (excelCompanyCertificateVo.getEffectiveDateName().equals("长期")) {
-                            excelCompanyCertificateVo.setEffectiveDate(1L);
+                            excelCompanyCertificateVo.setEffectiveFlag(1);
                         } else {
                             String effectiveDateName = excelCompanyCertificateVo.getEffectiveDateName();
                             Long operateDate = DateUtils.dateTimeSec("yyyy/MM/dd", effectiveDateName);
@@ -387,6 +406,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                         companyCertificate.setEstablishDate(company.getEstablishDate());
                         companyCertificate.setOperateDate(company.getOperateDate());
                         companyCertificate.setRegistrationAuthority(company.getRegistrationAuthority());
+                        companyCertificate.setEffectiveFlag(excelCompanyCertificateVo.getEffectiveFlag());
                         companyCertificate.setExperienceScope(company.getExperienceScope());
                         companyCertificate.setCertificateName(excelCompanyCertificateVo.getCertificateName());
                         companyCertificate.setText(excelCompanyCertificateVo.getText());
@@ -428,7 +448,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             }
                             if (ObjectUtil.isNotEmpty(item.getEffectiveDateName())) {
                                 if (item.getEffectiveDateName().equals("长期")) {
-                                    companyCertificate.setEffectiveDate(1L);
+                                    companyCertificate.setEffectiveFlag(1);
                                 } else {
                                     String effectiveDateName = item.getEffectiveDateName();
                                     Long operateDate = DateUtils.dateTimeSec("yyyy/MM/dd", effectiveDateName);
@@ -470,7 +490,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             }
                             if (ObjectUtil.isNotEmpty(item.getEffectiveDateName())) {
                                 if (item.getEffectiveDateName().equals("长期")) {
-                                    companyCertificate.setEffectiveDate(1L);
+                                    companyCertificate.setEffectiveFlag(1);
                                 } else {
                                     String effectiveDateName = item.getEffectiveDateName();
                                     Long operateDate = DateUtils.dateTimeSec("yyyy/MM/dd", effectiveDateName);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/CompanyCertificateVo.java

@@ -73,10 +73,10 @@ public class CompanyCertificateVo {
 	private Long issuanceDate;
 	/** 有效日期 1：长期 */
 	@ApiModelProperty("有效日期是否长期")
-	private int effectiveFlag;
+	private Integer effectiveFlag;
 	/** 有效日期 1：长期 */
 	@ApiModelProperty("营业时间是否长期")
-	private int operateFlag;
+	private Integer operateFlag;
 	/** 有效日期 1：长期 */
 	@Excel(name = "有效日期")
 	@ApiModelProperty("有效日期")
@@ -144,5 +144,5 @@ public class CompanyCertificateVo {
 	private String companyTypeName;
 	/** 企业类型名称 */
 	private Long createTime;
-
+	private String searchItem;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/ExcelCompanyCertificateVo.java

@@ -142,4 +142,6 @@ public class ExcelCompanyCertificateVo {
 	private Long issuanceDate;
 	/** 有效日期 */
 	private Long effectiveDate;
+	/** 有效日期 */
+	private Integer effectiveFlag;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/staff/bo/StaffCertificateQueryBo.java

@@ -87,5 +87,5 @@ public class StaffCertificateQueryBo extends BaseEntity {
 	/** 证书名称 */
 	@ApiModelProperty("证书名称")
 	private String certificateName;
-
+	private String searchItem;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/staff/bo/StaffQueryBo.java

@@ -135,4 +135,5 @@ public class StaffQueryBo extends BaseEntity {
 	/** 专业 */
 	@ApiModelProperty("专业")
 	private Long staffId;
+	private String searchItem;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/staff/service/impl/StaffCertificateServiceImpl.java

@@ -64,21 +64,22 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
                 String certificateTypeNameByType = getCertificateTypeNameByType(Long.valueOf(item.getCertificateType()));
                 item.setCertificateTypeName(certificateTypeNameByType);
             }
-            if (ObjectUtil.isAllNotEmpty(item.getStartTime(), item.getEndTime())) {
+            if (ObjectUtil.isNotEmpty(item.getEndTime())) {
                 Date effectivedate = new Date(item.getEndTime() * 1000L);
+                StaffCertificate staffCertificate = new StaffCertificate();
+                staffCertificate.setStaffCertificateId(item.getStaffCertificateId());
+                staffCertificate.setUpdateTime(DateUtils.getNowTime());
                 if (effectivedate.compareTo(new Date()) > 0) {
                     item.setExpirationTime(0L);
+                    staffCertificate.setWarningStatus(1);
                 } else {
                     //查询实时证书过期时间更新证书预警状态
-                    StaffCertificate staffCertificate = new StaffCertificate();
-                    staffCertificate.setUpdateTime(DateUtils.getNowTime());
                     staffCertificate.setWarningStatus(2);
-                    staffCertificate.setStaffCertificateId(item.getStaffCertificateId());
-                    this.baseMapper.updateById(staffCertificate);
                     long l = DateUtil.between(effectivedate, new Date(), DateUnit.DAY);
                     item.setWarningStatus(2);
                     item.setExpirationTime(l);
                 }
+                this.baseMapper.updateById(staffCertificate);
             }
         });
         return staffCertificateVos;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/system/domain/BsSysMenu.java

@@ -63,11 +63,11 @@ public class BsSysMenu implements Serializable
 
     /** 是否为外链（0是 1否） */
     @ApiModelProperty(value ="是否为外链（0是 1否）")
-    private int isFrame;
+    private String isFrame;
 
     /** 是否缓存（0缓存 1不缓存） */
     @ApiModelProperty(value ="是否缓存（0缓存 1不缓存）")
-    private int isCache;
+    private String isCache;
 
     /** 类型（M目录 C菜单 F按钮） */
     @ApiModelProperty(value ="类型（M目录 C菜单 F按钮）")
@@ -76,11 +76,11 @@ public class BsSysMenu implements Serializable
 
     /** 显示状态（0显示 1隐藏） */
     @ApiModelProperty(value ="显示状态（1显示 0隐藏）")
-    private Integer visible;
+    private String visible;
 
     /** 菜单状态（0显示 1隐藏） */
     @ApiModelProperty(value ="菜单状态（1显示 0隐藏）")
-    private Integer status;
+    private String status;
 
     /** 权限字符串 */
     @ApiModelProperty(value ="权限标识")

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyCertificateMapper.xml

@@ -68,9 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-    <select id="selectCompanyCertificate" parameterType="com.zhongzheng.modules.bs.company.vo.CompanyCertificateVo" resultMap="CompanyCertificateResultVo">
+    <select id="selectCompanyCertificate" parameterType="com.zhongzheng.modules.bs.company.bo.CompanyDepartmentQueryBo" resultMap="CompanyCertificateResultVo">
         select *
         from bs_company_certificate cc where cc.status=1
+        <if test="searchItem != null">
+            AND (cc.credit_code = #{searchItem} or cc.legal_representative = #{searchItem})
+        </if>
         <if test="certificateType != null">
             AND cc.certificate_type = #{certificateType}
         </if>
@@ -80,15 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyName != null">
             AND cc.company_name = #{companyName}
         </if>
-        <if test="creditCode != null">
-            AND cc.credit_code = #{creditCode}
-        </if>
         <if test="warningStatus != null">
             AND cc.warning_status = #{warningStatus}
         </if>
-        <if test="legalRepresentative != null">
-            AND cc.legal_representative = #{legalRepresentative}
-        </if>
         <if test="certificateName != null">
             AND cc.certificate_name = #{certificateName}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/staff/StaffCertificateMapper.xml

@@ -57,27 +57,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select *,sc.create_time AS addtime
         from bs_staff_certificate sc left join bs_staff s
             on sc.staff_id = s.staff_id where sc.status=1 and s.status=1
+        <if test="searchItem != null and searchItem != ''">
+            AND (sc.staff_name = #{searchItem} or sc.id_card = #{searchItem} or sc.certificate_number=#{searchItem})
+        </if>
         <if test="staffId != null and staffId != ''">
             AND sc.staff_id = #{staffId}
         </if>
         <if test="certificateType != null and certificateType != ''">
             AND sc.certificate_type = #{certificateType}
         </if>
-        <if test="staffName != null and staffName != ''">
-            AND s.staff_name = #{staffName}
-        </if>
         <if test="companyName != null and companyName != ''">
             AND s.company_name = #{companyName}
         </if>
-        <if test="idCard != null and idCard != ''">
-            AND s.id_card = #{idCard}
-        </if>
         <if test="warningStatus != null and warningStatus != ''">
             AND sc.warning_status = #{warningStatus}
         </if>
-        <if test="certificateNumber != null and certificateNumber != ''">
-            AND sc.certificate_number = #{certificateNumber}
-        </if>
         order by sc.create_time desc
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/staff/StaffMapper.xml

@@ -81,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     <select id="selectAllStaffList" parameterType="com.zhongzheng.modules.bs.staff.bo.StaffQueryBo" resultMap="StaffVoResult">
         select * from bs_staff s where s.status=1
+        <if test="searchItem != null and searchItem != ''">
+            AND (s.staff_name = #{searchItem} or s.id_card = #{searchItem} or s.telephone=#{searchItem})
+        </if>
         <if test="degree != null and degree != ''">
              AND (select count(seb.staff_id) from bs_staff_edu_bg seb where seb.staff_id=s.staff_id AND seb.degree = #{degree})>0
         </if>
@@ -98,18 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyName != null and companyName != ''">
             AND s.company_name = #{companyName}
         </if>
-        <if test="staffName != null and staffName != ''">
-            AND s.staff_name = #{staffName}
-        </if>
-        <if test="idCard != null and idCard != ''">
-            AND s.id_card = #{idCard}
-        </if>
         <if test="staffId != null and staffId != ''">
             AND s.staff_id = #{staffId}
         </if>
-        <if test="telephone != null">
-            AND s.telephone = #{telephone}
-        </if>
         ORDER BY s.create_time DESC
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/system/SysMenuMapper.xml

@@ -66,7 +66,7 @@
         order by m.parent_id, m.order_num
     </select>
 
-    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+    <select id="selectMenuListByUserId" parameterType="com.zhongzheng.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
         select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
         ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m