设备表、合作单位表更新；显示高级管理人员

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -3,6 +3,10 @@ package com.ruoyi.web.controller.oa;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcPartner;
+import com.ruoyi.oa.service.ICmcPartnerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +38,9 @@ public class CmcSubContractController extends BaseController
     @Autowired
     private ICmcSubContractService cmcSubContractService;
 
+    @Autowired
+    private ICmcPartnerService cmcPartnerService;
+
     /**
      * 查询cmc分包合同评审列表
      */
@@ -73,6 +80,14 @@ public class CmcSubContractController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcSubContract cmcSubContract)
     {
+        if (!cmcSubContract.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartner cmcPartner = new CmcPartner();
+            cmcPartner.setPartnerId(new SnowFlake().generateId());
+            cmcPartner.setPartnerName(cmcSubContract.getPartnerId());
+            cmcPartner.setContactPerson(cmcSubContract.getContactPerson());
+            cmcPartnerService.insertCmcPartner(cmcPartner);
+            cmcSubContract.setPartnerId(cmcPartner.getPartnerId());
+        }
         return toAjax(cmcSubContractService.insertCmcSubContract(cmcSubContract));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -74,6 +74,9 @@ public class SysUserController extends BaseController
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
+        if (user.getDeptId() != null && user.getDeptId() == 103L) {
+            list = postService.selectGmAssistant(user);
+        }
         return getDataTable(list);
     }
 
@@ -133,7 +136,6 @@ public class SysUserController extends BaseController
      */
     @GetMapping("/change")
     public TableDataInfo getChangeInfo(SysUser user) {
-        startPage();
         Long userId = user.getUserId();
         SysUser sysUser = userService.selectUserById(userId);
         List<Long> userPostList = postService.selectPostListByUserId(userId);

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java

@@ -67,19 +67,6 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "存放地点")
     private String place;
 
-    /** 校验周期（年） */
-    @Excel(name = "校验周期", readConverterExp = "年=")
-    private Integer checkTerm;
-
-    /** 校验时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "校验时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date checkTime;
-
-    /** 保修期（月） */
-    @Excel(name = "保修期", readConverterExp = "月=")
-    private Integer warranty;
-
     /** 管理部门id */
     @Excel(name = "管理部门id")
     private Long manageDept;
@@ -196,33 +183,6 @@ public class CmcDevice extends BaseEntity
     {
         return place;
     }
-    public void setCheckTerm(Integer checkTerm)
-    {
-        this.checkTerm = checkTerm;
-    }
-
-    public Integer getCheckTerm()
-    {
-        return checkTerm;
-    }
-    public void setCheckTime(Date checkTime)
-    {
-        this.checkTime = checkTime;
-    }
-
-    public Date getCheckTime()
-    {
-        return checkTime;
-    }
-    public void setWarranty(Integer warranty)
-    {
-        this.warranty = warranty;
-    }
-
-    public Integer getWarranty()
-    {
-        return warranty;
-    }
     public void setManageDept(Long manageDept)
     {
         this.manageDept = manageDept;
@@ -258,9 +218,6 @@ public class CmcDevice extends BaseEntity
                 .append("dayCost", getDayCost())
                 .append("place", getPlace())
                 .append("remark", getRemark())
-                .append("checkTerm", getCheckTerm())
-                .append("checkTime", getCheckTime())
-                .append("warranty", getWarranty())
                 .append("manageDept", getManageDept())
                 .toString();
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPartner.java

@@ -22,12 +22,16 @@ public class CmcPartner extends BaseEntity
     @Excel(name = "单位名称")
     private String partnerName;
 
-    public void setPartnerId(String partnerId) 
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    public void setPartnerId(String partnerId)
     {
         this.partnerId = partnerId;
     }
 
-    public String getPartnerId() 
+    public String getPartnerId()
     {
         return partnerId;
     }
@@ -40,12 +44,22 @@ public class CmcPartner extends BaseEntity
     {
         return partnerName;
     }
+    public void setContactPerson(String contactPerson)
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson()
+    {
+        return contactPerson;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("partnerId", getPartnerId())
             .append("partnerName", getPartnerName())
+            .append("contactPerson", getContactPerson())
             .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSupply.java

@@ -66,19 +66,6 @@ public class CmcSupply extends BaseEntity
     @Excel(name = "存放地点")
     private String place;
 
-    /** 校验周期（年） */
-    @Excel(name = "校验周期", readConverterExp = "年=")
-    private Long checkTerm;
-
-    /** 保修期（月） */
-    @Excel(name = "保修期", readConverterExp = "月=")
-    private Long warranty;
-
-    /** 校验日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "校验日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date checkTime;
-
     /** 管理部门 */
     @Excel(name = "管理部门")
     private Long manageDept;
@@ -191,33 +178,6 @@ public class CmcSupply extends BaseEntity
     {
         return place;
     }
-    public void setCheckTerm(Long checkTerm) 
-    {
-        this.checkTerm = checkTerm;
-    }
-
-    public Long getCheckTerm() 
-    {
-        return checkTerm;
-    }
-    public void setWarranty(Long warranty) 
-    {
-        this.warranty = warranty;
-    }
-
-    public Long getWarranty() 
-    {
-        return warranty;
-    }
-    public void setCheckTime(Date checkTime) 
-    {
-        this.checkTime = checkTime;
-    }
-
-    public Date getCheckTime() 
-    {
-        return checkTime;
-    }
     public void setManageDept(Long manageDept) 
     {
         this.manageDept = manageDept;
@@ -244,9 +204,6 @@ public class CmcSupply extends BaseEntity
             .append("dayCost", getDayCost())
             .append("place", getPlace())
             .append("remark", getRemark())
-            .append("checkTerm", getCheckTerm())
-            .append("warranty", getWarranty())
-            .append("checkTime", getCheckTime())
             .append("manageDept", getManageDept())
             .toString();
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -52,6 +52,14 @@ public interface SysUserPostMapper
      */
     public List<SysUser> selectDriverList();
 
+    /**
+     * 查询高级管理员集合
+     *
+     * @param
+     * @return 高级管理员列表
+     */
+    public List<SysUser> selectGmAssistant(SysUser user);
+
     /**
      * 查询总经理
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -108,6 +108,14 @@ public interface ISysPostService
      */
     public List<SysUser> selectDriverList();
 
+    /**
+     * 查询高级管理员集合
+     *
+     * @param
+     * @return 高级管理员列表
+     */
+    public List<SysUser> selectGmAssistant(SysUser user);
+
     /**
      * 查询总经理
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -189,6 +189,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDriverList();
     }
 
+    /**
+     * 查询高级管理员集合
+     *
+     * @param
+     * @return 高级管理员列表
+     */
+    @Override
+    public List<SysUser> selectGmAssistant(SysUser user) {
+        return userPostMapper.selectGmAssistant(user);
+    }
+
     /**
      * 查询总经理
      *

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceMapper.xml

@@ -18,9 +18,6 @@
         <result property="dayCost"    column="day_cost"    />
         <result property="place"    column="place"    />
         <result property="remark"    column="remark"    />
-        <result property="checkTerm"    column="check_term"    />
-        <result property="checkTime"    column="check_time"    />
-        <result property="warranty"    column="warranty"    />
         <result property="manageDept"    column="manage_dept"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
     </resultMap>
@@ -31,7 +28,7 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.check_term, d.check_time, d.warranty, d.manage_dept, dept.dept_name from cmc_device as d left join sys_dept as dept
+        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, dept.dept_name from cmc_device as d left join sys_dept as dept
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
@@ -49,9 +46,6 @@
             <if test="brand != null  and brand != ''"> and d.brand like concat('%', #{brand}, '%')</if>
             <if test="dayCost != null "> and d.day_cost = #{dayCost}</if>
             <if test="place != null  and place != ''"> and d.place like concat('%', #{place}, '%')</if>
-            <if test="checkTerm != null "> and d.check_term = #{checkTerm}</if>
-            <if test="checkTime != null "> and d.check_time = #{checkTime}</if>
-            <if test="warranty != null "> and d.warranty = #{warranty}</if>
             <if test="manageDept != null "> and d.manage_dept = #{manageDept}</if>
         </where>
     </select>
@@ -81,9 +75,6 @@
             <if test="dayCost != null">day_cost,</if>
             <if test="place != null">place,</if>
             <if test="remark != null">remark,</if>
-            <if test="checkTerm != null">check_term,</if>
-            <if test="checkTime != null">check_time,</if>
-            <if test="warranty != null">warranty,</if>
             <if test="manageDept != null">manage_dept,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -99,9 +90,6 @@
             <if test="dayCost != null">#{dayCost},</if>
             <if test="place != null">#{place},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="checkTerm != null">#{checkTerm},</if>
-            <if test="checkTime != null">#{checkTime},</if>
-            <if test="warranty != null">#{warranty},</if>
             <if test="manageDept != null">#{manageDept},</if>
         </trim>
     </insert>
@@ -121,9 +109,6 @@
             <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="place != null">place = #{place},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="checkTerm != null">check_term = #{checkTerm},</if>
-            <if test="checkTime != null">check_time = #{checkTime},</if>
-            <if test="warranty != null">warranty = #{warranty},</if>
             <if test="manageDept != null">manage_dept = #{manageDept},</if>
         </trim>
         where device_id = #{deviceId}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcPartnerMapper.xml

@@ -7,10 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcPartner" id="CmcPartnerResult">
         <result property="partnerId"    column="partner_id"    />
         <result property="partnerName"    column="partner_name"    />
+        <result property="contactPerson"    column="contact_person"    />
     </resultMap>
 
     <sql id="selectCmcPartnerVo">
-        select partner_id, partner_name from cmc_partner
+        select partner_id, partner_name, contact_person from cmc_partner
     </sql>
 
     <select id="selectCmcPartnerList" parameterType="CmcPartner" resultMap="CmcPartnerResult">
@@ -30,10 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="partnerId != null">partner_id,</if>
             <if test="partnerName != null">partner_name,</if>
+            <if test="contactPerson != null">contact_person,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="partnerId != null">#{partnerId},</if>
             <if test="partnerName != null">#{partnerName},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
          </trim>
     </insert>
 
@@ -41,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_partner
         <trim prefix="SET" suffixOverrides=",">
             <if test="partnerName != null">partner_name = #{partnerName},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
         </trim>
         where partner_id = #{partnerId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -20,6 +20,8 @@
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="projectPlanner"    column="project_planner"    />
         <result property="siteLeader"    column="site_leader"    />
+        <result property="organizeDocument"    column="organize_document"    />
+        <result property="organizeTime"    column="organize_time"    />
         <result property="registerTime"    column="register_time"    />
         <result property="planTime"    column="plan_time"    />
         <result property="entryTime"    column="entry_time"    />
@@ -61,9 +63,9 @@
 
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone,
-               p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time,
-               p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name, u3.user_id as inspector_user_id,
-               p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates from cmc_project as p
+               p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
+               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name,
+               u3.user_id as inspector_user_id, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
@@ -122,6 +124,8 @@
             <if test="undertakingDept != null">undertaking_dept,</if>
             <if test="projectPlanner != null">project_planner,</if>
             <if test="siteLeader != null">site_leader,</if>
+            <if test="organizeDocument != null">organize_document,</if>
+            <if test="organizeTime != null">organize_time,</if>
             <if test="registerTime != null">register_time,</if>
             <if test="planTime != null">plan_time,</if>
             <if test="entryTime != null">entry_time,</if>
@@ -152,6 +156,8 @@
             <if test="undertakingDept != null">#{undertakingDept},</if>
             <if test="projectPlanner != null">#{projectPlanner},</if>
             <if test="siteLeader != null">#{siteLeader},</if>
+            <if test="organizeDocument != null">#{organizeDocument},</if>
+            <if test="organizeTime != null">#{organizeTime},</if>
             <if test="registerTime != null">#{registerTime},</if>
             <if test="planTime != null">#{planTime},</if>
             <if test="entryTime != null">#{entryTime},</if>
@@ -185,6 +191,8 @@
             <if test="undertakingDept != null">undertaking_dept = #{undertakingDept},</if>
             <if test="projectPlanner != null">project_planner = #{projectPlanner},</if>
             <if test="siteLeader != null">site_leader = #{siteLeader},</if>
+            <if test="organizeDocument != null">organize_document = #{organizeDocument},</if>
+            <if test="organizeTime != null">organize_time = #{organizeTime},</if>
             <if test="registerTime != null">register_time = #{registerTime},</if>
             <if test="planTime != null">plan_time = #{planTime},</if>
             <if test="entryTime != null">entry_time = #{entryTime},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSupplyMapper.xml

@@ -18,14 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dayCost"    column="day_cost"    />
         <result property="place"    column="place"    />
         <result property="remark"    column="remark"    />
-        <result property="checkTerm"    column="check_term"    />
-        <result property="warranty"    column="warranty"    />
-        <result property="checkTime"    column="check_time"    />
         <result property="manageDept"    column="manage_dept"    />
     </resultMap>
 
     <sql id="selectCmcSupplyVo">
-        select supply_id, supply_number, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, check_term, warranty, check_time, manage_dept from cmc_supply
+        select supply_id, supply_number, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, manage_dept from cmc_supply
     </sql>
 
     <select id="selectCmcSupplyList" parameterType="CmcSupply" resultMap="CmcSupplyResult">
@@ -42,9 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
             <if test="dayCost != null "> and day_cost = #{dayCost}</if>
             <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="checkTerm != null "> and check_term = #{checkTerm}</if>
-            <if test="warranty != null "> and warranty = #{warranty}</if>
-            <if test="checkTime != null "> and check_time = #{checkTime}</if>
             <if test="manageDept != null "> and manage_dept = #{manageDept}</if>
         </where>
     </select>
@@ -69,9 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dayCost != null">day_cost,</if>
             <if test="place != null">place,</if>
             <if test="remark != null">remark,</if>
-            <if test="checkTerm != null">check_term,</if>
-            <if test="warranty != null">warranty,</if>
-            <if test="checkTime != null">check_time,</if>
             <if test="manageDept != null">manage_dept,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -87,9 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dayCost != null">#{dayCost},</if>
             <if test="place != null">#{place},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="checkTerm != null">#{checkTerm},</if>
-            <if test="warranty != null">#{warranty},</if>
-            <if test="checkTime != null">#{checkTime},</if>
             <if test="manageDept != null">#{manageDept},</if>
          </trim>
     </insert>
@@ -109,9 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="place != null">place = #{place},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="checkTerm != null">check_term = #{checkTerm},</if>
-            <if test="warranty != null">warranty = #{warranty},</if>
-            <if test="checkTime != null">check_time = #{checkTime},</if>
             <if test="manageDept != null">manage_dept = #{manageDept},</if>
         </trim>
         where supply_id = #{supplyId}

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -11,7 +11,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<resultMap type="SysUser" id="SysUserResult">
 		<id     property="userId"       column="user_id"      />
+		<result property="deptId"       column="dept_id"      />
+		<result property="userName"     column="user_name"    />
 		<result property="nickName"     column="nick_name"    />
+		<result property="email"        column="email"        />
+		<result property="phonenumber"  column="phonenumber"  />
+		<result property="sex"          column="sex"          />
+		<result property="avatar"       column="avatar"       />
+		<result property="password"     column="password"     />
+		<result property="status"       column="status"       />
+		<result property="delFlag"      column="del_flag"     />
+		<result property="loginIp"      column="login_ip"     />
+		<result property="loginDate"    column="login_date"   />
+		<result property="createBy"     column="create_by"    />
+		<result property="createTime"   column="create_time"  />
+		<result property="updateBy"     column="update_by"    />
+		<result property="updateTime"   column="update_time"  />
+		<result property="remark"       column="remark"       />
+		<result property="pmLevel"       column="pm_level"       />
+		<result property="titles"       column="titles"       />
+		<result property="certificates"       column="certificates"       />
+		<result property="updateReason"       column="update_reason"       />
+		<result property="engineerLevel"       column="engineer_level"       />
+		<result property="postLevel"       column="post_level"       />
+		<result property="salaryLevel"       column="salary_level"       />
+		<result property="operatorLevel"    column="operator_level"    />
+		<result property="entryDate"       column="entry_date"       />
+		<result property="birthday"       column="birthday"       />
+		<result property="age"       column="age"       />
+		<result property="idCard"    column="id_card"    />
+		<result property="nativePlace"    column="native_place"    />
+		<result property="politicalAffiliation"    column="political_affiliation"    />
+		<result property="ethnic"    column="ethnic"    />
+		<result property="graduateSchool"    column="graduate_school"    />
+		<result property="major"    column="major"    />
+		<result property="degree"    column="degree"    />
+		<result property="contractSign"    column="contract_sign"    />
+		<result property="contractExpire"    column="contract_expire"    />
+		<result property="homePlace"    column="home_place"    />
+		<association property="dept"    javaType="SysDept"         resultMap="deptResult" />
+	</resultMap>
+
+	<resultMap id="deptResult" type="SysDept">
+		<id     property="deptId"    column="dept_id"     />
+		<result property="deptName"  column="dept_name"   />
 	</resultMap>
 
 	<select id="selectDriverList" resultMap="SysUserResult">
@@ -20,6 +63,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 27 and u.status = '0'
 	</select>
 
+	<select id="selectGmAssistant" parameterType="SysUser" resultMap="SysUserResult">
+		select u.*, d.dept_name
+		from sys_user u
+				 left join sys_dept d on u.dept_id = d.dept_id
+				 left join sys_user_post up on u.user_id = up.user_id
+		where up.post_id = 11
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+	</select>
+
 	<select id="selectGm" resultMap="SysUserResult">
 		select u.user_id, u.nick_name
 		from sys_user u left join sys_user_post up on u.user_id = up.user_id

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 14:32:41
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-20 16:11:08
 -->
 <template>
   <div class="app-container">
@@ -66,8 +66,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select v-model="form.partnerId" filterable placeholder="请选择" :disabled="taskName != '合同拟稿'"
-                  clearable>
+                <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" :disabled="taskName != '合同拟稿'"
+                  clearable @change="handleSelectPartner">
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -81,6 +81,23 @@
             </el-col>
           </el-row>
 
+          <el-form-item label="合同文件" prop="contractDocument">
+            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'分包合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
+            <div v-if="taskName != '合同拟稿'">
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.contractDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
@@ -393,7 +410,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
-import { listPartner } from "@/api/oa/partner/partner";
+import { listPartner, getPartner } from "@/api/oa/partner/partner";
 import { listContractWork, addContractWork } from "@/api/oa/contract/contractWork";
 import { listContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
 import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
@@ -717,6 +734,12 @@ export default {
         this.deptList = res.data
       })
     },
+    // 选择单位
+    handleSelectPartner(val) {
+      getPartner(val).then(response => {
+        this.$set(this.form, 'contactPerson', response.data.contactPerson);
+      })
+    },
     // 选择项目
     handleSelectProject(val) {
       if (val != "" && val != undefined && val != null) {
@@ -1004,6 +1027,13 @@ export default {
         return arr[arr.length - 1];
       }
     },
+    getContractPath(val) {
+      let arr = val.split('/upload')
+      this.form.contractDocument = arr[1]
+      if (val == "") {
+        this.form.contractDocument = ""
+      }
+    },
     getMeetingPath(val) {
       let arr = val.split('/upload')
       this.meetingForm.document = arr[1]

oa-ui/src/views/oa/device/approval.vue

@@ -69,27 +69,6 @@
         </template>
         {{ deviceInfo.place }}
       </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          校验周期（年）
-        </template>
-        {{ deviceInfo.checkTerm }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          保修期（月）
-        </template>
-        {{ deviceInfo.warranty }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          校验日期
-        </template>
-        {{ parseTime(deviceInfo.checkTime, '{y}-{m}-{d}') }}
-      </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />

oa-ui/src/views/oa/device/index.vue

@@ -51,9 +51,6 @@
       <el-table-column label="设备品牌" align="center" prop="brand" />
       <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
-      <el-table-column label="校验周期（年）" align="center" prop="checkTerm" />
-      <el-table-column label="保修期（月）" align="center" prop="warranty" />
-      <el-table-column label="校验日期" align="center" prop="checkTime" />
       <el-table-column label="管理部门" align="center" prop="dept.deptName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -137,35 +134,11 @@
             <el-form-item label="设备类别" prop="place">
               <el-input v-model="form.type" placeholder="请输入设备类别" />
             </el-form-item>
-
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="校验周期" prop="checkTerm">
-              <el-input v-model="form.checkTerm" placeholder="请输入校验周期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="校验日期" prop="checkTime">
-              <el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择校验日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="保修期" prop="warranty">
-              <el-input v-model="form.warranty" placeholder="请输入保修期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="管理部门" prop="dept.deptName">
-              <el-input v-model="form.deptName" placeholder="请输入管理部门" />
-            </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="管理部门" prop="dept.deptName">
+          <el-input v-model="form.deptName" placeholder="请输入管理部门" />
+        </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">

oa-ui/src/views/oa/supply/index.vue

@@ -81,30 +81,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="校验周期" prop="checkTerm">
-        <el-input
-          v-model="queryParams.checkTerm"
-          placeholder="请输入校验周期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="保修期" prop="warranty">
-        <el-input
-          v-model="queryParams.warranty"
-          placeholder="请输入保修期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="校验日期" prop="checkTime">
-        <el-date-picker clearable
-          v-model="queryParams.checkTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择校验日期">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="管理部门" prop="manageDept">
         <el-input
           v-model="queryParams.manageDept"
@@ -184,13 +160,6 @@
       <el-table-column label="单日成本" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="校验周期" align="center" prop="checkTerm" />
-      <el-table-column label="保修期" align="center" prop="warranty" />
-      <el-table-column label="校验日期" align="center" prop="checkTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="管理部门" align="center" prop="manageDept" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -261,20 +230,6 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="校验周期" prop="checkTerm">
-          <el-input v-model="form.checkTerm" placeholder="请输入校验周期" />
-        </el-form-item>
-        <el-form-item label="保修期" prop="warranty">
-          <el-input v-model="form.warranty" placeholder="请输入保修期" />
-        </el-form-item>
-        <el-form-item label="校验日期" prop="checkTime">
-          <el-date-picker clearable
-            v-model="form.checkTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择校验日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="管理部门" prop="manageDept">
           <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
         </el-form-item>
@@ -327,9 +282,6 @@ export default {
         brand: null,
         dayCost: null,
         place: null,
-        checkTerm: null,
-        warranty: null,
-        checkTime: null,
         manageDept: null
       },
       // 表单参数
@@ -373,9 +325,6 @@ export default {
         dayCost: null,
         place: null,
         remark: null,
-        checkTerm: null,
-        warranty: null,
-        checkTime: null,
         manageDept: null
       };
       this.resetForm("form");