Merge remote-tracking branch 'origin/master'

src/main/java/com/liang/controller/BaseCompanyController.java

@@ -213,7 +213,6 @@ public class BaseCompanyController extends BaseController {
                          @RequestParam("limit") Integer pageSize,
                          @RequestParam(required = false, defaultValue = "", value = "mc") String mc) {
         PageHelper.startPage(pageNum, pageSize);
-
         Map<String, String> paraMap = new HashMap<>();
         paraMap.put("mc", mc);
         List<BaseCompany> list = baseCompanyService.getBaseCompanyList(paraMap);

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -158,7 +158,7 @@ public class PrjApproverecordController extends BaseController {
         }
             paraMap.put("id",userInfo.getUserId().toString());
         // 获取当前人员岗位名称
-        List<SysUserInfo> accounts = sysUserInfoService.getSysUserInfoList(paraMap);
+        List<SysUserInfo> accounts = sysUserInfoService.getGw(paraMap);
         // 去重
         if (accounts.size()==0){
             return BaseResult.success(prjApproverecords);

src/main/java/com/liang/dao/SysUserInfoDao.java

@@ -90,6 +90,11 @@ public interface SysUserInfoDao {
      */
     List<SysUserInfo> getSysUserInfoList(Map map);
 
+    /**
+     * 获取岗位列表
+     */
+
+    List<SysUserInfo> getGw(Map map);
     /**
      * 获取用户
      *

src/main/java/com/liang/service/SysUserInfoService.java

@@ -66,6 +66,13 @@ public interface SysUserInfoService {
      */
     List<SysUserInfo> getSysUserInfoList(Map map);
 
+    /**
+     * 获取岗位信息
+     * @param map
+     * @return
+     */
+
+    List<SysUserInfo> getGw(Map map);
     /**
      * 获取用户
      *

src/main/java/com/liang/service/impl/SysUserInfoServiceImpl.java

@@ -25,6 +25,8 @@ public class SysUserInfoServiceImpl implements SysUserInfoService {
     @Resource
     private SysUserInfoDao sysUserInfoDao;
 
+
+
     /**
      * 通过ID查询单条数据
      *
@@ -93,6 +95,11 @@ public class SysUserInfoServiceImpl implements SysUserInfoService {
         return this.sysUserInfoDao.getSysUserInfoList(map);
     }
 
+    @Override
+    public List<SysUserInfo> getGw(Map map) {
+        return this.sysUserInfoDao.getGw(map);
+    }
+
     /**
      * 获取用户信息
      *

src/main/resources/mapper/SysUserInfoDao.xml

@@ -332,6 +332,48 @@
         rn = 1;
     </select>
 
+    <select id="getGw" resultMap="SysUserInfoMap" parameterType="map">
+        select u.*, d.dept_name as deptName, p.post_name as userPostName
+        from sys_user_info u
+        left join sys_dept_info d on d.dept_id = u.dept_id
+        left join sys_user_post up on up.user_id = u.user_id
+        left join sys_post_info p on p.post_id = up.post_id
+        where u.del_flag = 0
+        <if test="account != null and account != ''">
+            and u.account = #{account}
+        </if>
+        <if test="name != null and name != ''">
+            and u.name like '%'+#{name}+'%'
+        </if>
+        <if test="deptName != null and deptName != ''">
+            and d.dept_name like '%'+#{deptName}+'%'
+        </if>
+        <if test="status != null and status != ''">
+            and u.status = #{status}
+        </if>
+        <if test="id != null and id != ''">
+            and u.user_id = #{id}
+        </if>
+        <if test="postName != null and postName != ''">
+            and p.post_name like '%'+#{postName}+'%'
+        </if>
+        <if test="ssbm != null and ssbm != ''">
+            and d.dept_id = #{ssbm}
+        </if>
+        <choose>
+            <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
+                order by ${sortName} ${sortOrder}
+            </when>
+            <otherwise>
+                order by u.user_id asc
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+
+
     <!--查询用户-->
     <select id="getSysUserInfo" resultMap="SysUserInfoMap" parameterType="map">
         select * from sys_user_info

src/main/resources/templates/reportinfo/add.html

@@ -49,7 +49,8 @@
                         <div class="layui-input-inline" style="width: 85%">
                             <input type="hidden" id="id" name="id">
                             <input type="text" id="mc" name="mc" lay-verify="required" lay-reqtext="项目名称不能为空"
-                                   placeholder="项目名称（中文）不能超过30字（含字符）" autocomplete="off" class="layui-input">
+                                   placeholder="请输入项目名称..." autocomplete="off" class="layui-input">
+                            <div style="color: red">注：项目名称（中文）不能超过30字（含字符）</div>
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -57,7 +58,7 @@
                         <div class="layui-input-inline" style="width: 85%">
                             <input type="hidden" name="sqdw" id="sqdw" class="layui-input">
                             <input type="text" id="sqdwName" name="sqdwName" lay-verify="required"
-                                   lay-reqtext="申请单位不能为空" autocomplete="off" class="layui-input" readonly>
+                                   lay-reqtext="申请单位不能为空" autocomplete="off" class="layui-input" placeholder="请选择单位..." readonly>
                         </div>
                     </div>
                     <div class="layui-form-item layui-inline" style="width: 100%">
@@ -71,7 +72,7 @@
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline">
                                 <input type="text" name="wc" id="wc" lay-verify="required" lay-reqtext="结束日期不能为空"
-                                       placeholder="结束日期" class="layui-input">
+                                       placeholder="请选择结束日期..." class="layui-input">
                             </div>
                         </div>
                     </div>
@@ -81,7 +82,7 @@
                         <div class="layui-input-inline" style="width: 85%">
                             <select name="xmlx" id="xmlx" lay-filter="status" lay-verify="required"
                                     lay-reqtext="请选择项目类型">
-                                <option value="">--请选择--</option>
+                                <option value="">--请选择项目类型--</option>
                                 <option th:each="item:${xmlxList}" th:text="${item.name}"
                                         th:value="${item.code}"></option>
                             </select>
@@ -120,11 +121,11 @@
                         <label class="layui-form-label" style="width: 90px">通讯地址</label>
                         <div class="layui-input-inline" style="width: 85%">
                             <div class="layui-input-inline" style="width: 400px">
-                                <input type="text" name="txdd" id="txdd" autocomplete="off" class="layui-input">
+                                <input type="text" name="txdd" id="txdd" autocomplete="off" class="layui-input" placeholder="请填入通讯地址...">
                             </div>
                             <div class="layui-form-label">邮政编码</div>
                             <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" name="yzbm" id="yzbm" autocomplete="off" class="layui-input">
+                                <input type="text" name="yzbm" id="yzbm" autocomplete="off" class="layui-input" placeholder="请填入邮政编码...">
                             </div>
                         </div>
                     </div>
@@ -132,11 +133,11 @@
                         <label class="layui-form-label" style="width: 90px">电话</label>
                         <div class="layui-input-inline" style="width: 85%">
                             <div class="layui-input-inline" style="width: 400px">
-                                <input type="text" name="dh" id="dh" autocomplete="off" class="layui-input">
+                                <input type="text" name="dh" id="dh" autocomplete="off" class="layui-input" placeholder="请输入电话号码...">
                             </div>
                             <div class="layui-form-label">传真</div>
                             <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" name="cz" id="cz" autocomplete="off" class="layui-input">
+                                <input type="text" name="cz" id="cz" autocomplete="off" class="layui-input" placeholder="请输入传真地址...">
                             </div>
                         </div>
                     </div>
@@ -179,7 +180,7 @@
                         <label class="layui-form-label" style="width: 90px">目的和意义</label>
                         <div class="layui-input-inline" style="width: 85%">
                             <textarea id="mdhyywb" name="mdhyywb" class="layui-textarea"
-                                      style="width: 100%;height: 339px"></textarea>
+                                      style="width: 100%;height: 339px" placeholder="请输入..."></textarea>
                             <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容，如果包含图片，请下载模板编辑后上传，并清空当前编辑框</label>
                         </div>
                     </div>
@@ -657,7 +658,7 @@
     </div>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
@@ -681,17 +682,47 @@
         //日期
         laydate.render({
             elem: '#qs',
-            value: new Date()
+            value: new Date(),
+            done:function () {
+                var qs = $("#qs").val();
+                var wc = $("#wc").val();
+                if (qs!= "" && wc!= "") {
+                    if (isValidDate(qs) && isValidDate(wc)) {
+                        let startDate = new Date(qs);
+                        let endDate = new Date(wc);
+                        // 计算起始日期三个月后的日期
+                        let threeMonthsLater = new Date(startDate);
+                        threeMonthsLater.setMonth(startDate.getMonth() + 3);
+                        if (endDate < threeMonthsLater) {
+                            layer.msg("结束日期不能早于起始日期三个月！", {icon:2}, function () {
+                                $("#wc").val("");
+                            });
+                        }
+                    } else {
+                        layer.msg("请输入有效的日期格式！", {icon:2});
+                    }
+                }
+            }
         });
         laydate.render({
             elem: '#wc',
             done: function (value, date, endDate) {
                 var qs = $("#qs").val();
                 var wc = $("#wc").val();
-                if (qs != "" && wc != "") {
-                    if (qs > wc) {
-                        Message.warning("结束日期不能早于起始日期！", 1500);
-                        $("#wc").val("");
+                if (qs!= "" && wc!= "") {
+                    if (isValidDate(qs) && isValidDate(wc)) {
+                        let startDate = new Date(qs);
+                        let endDate = new Date(wc);
+                        // 计算起始日期三个月后的日期
+                        let threeMonthsLater = new Date(startDate);
+                        threeMonthsLater.setMonth(startDate.getMonth() + 3);
+                        if (endDate < threeMonthsLater) {
+                            layer.msg("结束日期不能早于起始日期三个月！", {icon:2}, function () {
+                                $("#wc").val("");
+                            });
+                        }
+                    } else {
+                        layer.msg("请输入有效的日期格式！", {icon:2});
                     }
                 }
             }
@@ -711,8 +742,8 @@
                 url: AjaxUtil.ctx + 'baseCompany/dwlist',
                 cols: [
                     [
-                        {type: 'radio'},
-                        {type: 'numbers',title:'序号', align: 'center'},
+                        {type: 'radio',title: '😊'},
+                        {type: 'numbers',title:'序号', align: 'center',width: '7%'},
                         {field: 'mc', width: '40%', title: '名称'},
                         {field: 'dwqc', width: '40%', title: '单位全称'}
                     ]
@@ -2284,6 +2315,10 @@
             }
         });
     }
+    function isValidDate(dateString) {
+        let date = new Date(dateString);
+        return!isNaN(date.getTime());
+    }
 </script>
 </body>
 </html>

src/main/resources/templates/reportinfo/addfzr.html

@@ -27,7 +27,7 @@
             <label class="layui-form-label required" style="width: 70px">姓名</label>
             <div class="layui-input-inline" style="width: 650px">
                 <input type="hidden" id="ry" name="ry">
-                <input type="text" id="ryxm" name="ryxm" lay-verify="required" lay-reqtext="姓名不能为空" class="layui-input"
+                <input type="text" id="ryxm" name="ryxm" lay-verify="required" lay-reqtext="姓名不能为空" class="layui-input" placeholder="请选择姓名..."
                        readonly>
             </div>
         </div>
@@ -37,6 +37,7 @@
             <div class="layui-input-inline" style="width: 650px">
                 <input type="hidden" id="dw" name="dw">
                 <input type="text" id="dwmc" name="dwmc" class="layui-input" readonly>
+                <div style="color: red">自动带入，无需选择</div>
             </div>
         </div>
 
@@ -44,6 +45,7 @@
             <label class="layui-form-label" style="width: 70px">联系电话</label>
             <div class="layui-input-inline" style="width: 650px">
                 <input type="text" id="gddh" name="gddh" class="layui-input" readonly>
+                <div style="color: red">自动带入，无需选择</div>
             </div>
         </div>