项目登记后，企业微信消息通知分管

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

@@ -1,13 +1,20 @@
 package com.ruoyi.web.controller.oa;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.web.controller.qyweixin.MessageController;
+import com.ruoyi.web.controller.system.SysPostController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -53,13 +60,7 @@ public class CmcProjectController extends BaseController
         startPage();
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
-            String underTakingDept = project.getUndertakingDept();
-            StringBuilder underTakingDeptName = new StringBuilder();
-            if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
-                for (String dept : underTakingDept.split(","))
-                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-                project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
-            }
+            project.setUndertakingDeptName(deptIdToName(project));
             String qualityInspector = project.getQualityInspector();
             StringBuilder qualityInspectorName = new StringBuilder();
             if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
@@ -90,13 +91,7 @@ public class CmcProjectController extends BaseController
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
-        String underTakingDept = cmcProject.getUndertakingDept();
-        StringBuilder underTakingDeptName = new StringBuilder();
-        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
-            for (String dept : underTakingDept.split(","))
-                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
-        }
+        cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
         String qualityInspector = cmcProject.getQualityInspector();
         StringBuilder qualityInspectorName = new StringBuilder();
         if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
@@ -124,10 +119,36 @@ public class CmcProjectController extends BaseController
      */
     @Log(title = "cmc项目", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcProject cmcProject)
-    {
+    public AjaxResult add(@RequestBody CmcProject cmcProject) throws IOException {
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
+//        if (cmcProjectService.insertCmcProject(cmcProject) > 0) {
+//            String message = "经营发展部已发起项目登记：  \n>" +
+//                    "登记人： <font color='info'>" + userService.selectUserById(cmcProject.getProjectRegistrant()).getNickName() + "</font>  \n>" +
+//                    "项目编号：" + cmcProject.getProjectNumber() + "  \n>" +
+//                    "项目名称：" + cmcProject.getProjectName() + "  \n>" +
+//                    "  \n>" +
+//                    "项目类型：<font color='comment'>" + cmcProject.getProjectType() + "</font>  \n>" +
+//                    "项目来源：" + (cmcProject.getProjectSource().equals("0") ? "院内" : "院外") +"  \n>" +
+//                    "甲方单位：" + cmcPartyAService.selectCmcPartyAByPartyAId(cmcProject.getPartyAId()).getPartyAName() + "  \n>" +
+//                    "  \n>" +
+//                    "承担部门：<font color='warning'>" + deptIdToName(cmcProject) + "</font>  \n>" +
+//                    "请您确认承担部门，及时跟进项目流转  \n>" +
+//                    "  \n>";
+//            if (cmcProject.getUndertakingDept() != null) {
+//                String deptString = cmcProject.getUndertakingDept() + ",105";
+//                List<String> managerList = new ArrayList<>();
+//                String[] deptId = deptString.split(",");
+//                for (String dept : deptId) {
+//                        List<SysUser> manageList = SysPostController.getManageId(dept, null);
+//                        for (SysUser manager : manageList) {
+//                            managerList.add(manager.getPinyin());
+//
+//                    }
+//                }
+//                MessageController.sendAppMessage(message, StringUtils.join(managerList, "|"));
+//            }
+//        }
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
@@ -151,4 +172,15 @@ public class CmcProjectController extends BaseController
         cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectIds);
         return success(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
     }
+
+    public String deptIdToName(CmcProject cmcProject) {
+        String underTakingDept = cmcProject.getUndertakingDept();
+        StringBuilder underTakingDeptName = new StringBuilder();
+        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+            for (String dept : underTakingDept.split(","))
+                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+        }
+        return cmcProject.getUndertakingDeptName();
+    }
 }

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

@@ -0,0 +1,111 @@
+package com.ruoyi.web.controller.qyweixin;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.oa.domain.CmcProject;
+import liquibase.pro.packaged.S;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * 通用请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/qyweixin")
+public class MessageController
+{
+    /**
+     * 获取企业微信token并发送消息
+     *
+     */
+    @PostMapping("/sendMessage")
+    public static void sendMessage(String message, String userString) throws IOException {
+        String getUrlString = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=wwe7757ae3518f5674&corpsecret=6bvHwvgaMUwk_7EwEyLV-v_2nai-4I8qeewhFJgV0aI";
+        URL getUrl = new URL(getUrlString);
+        //打开和url之间的连接
+        HttpURLConnection conn = (HttpURLConnection) getUrl.openConnection();
+        //请求方式
+        conn.setRequestMethod("GET");
+        //设置通用的请求属性
+        conn.setRequestProperty("accept", "*/*");
+        conn.setRequestProperty("connection", "Keep-Alive");
+        conn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+        //设置是否向httpUrlConnection输出，设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个
+        //最常用的Http请求无非是get和post，get请求可以获取静态页面，也可以把参数放在URL字串后面，传递给servlet，
+        //post与get的 不同之处在于post的参数不是放在URL字串里面，而是放在http请求的正文内。get请求不需要设置
+        //获取URLConnection对象对应的输出流
+        conn.connect();
+        //获取URLConnection对象对应的输入流
+        InputStream is = conn.getInputStream();
+        //构造一个字符流缓存
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
+        String str = "";
+        JSONObject json = null;
+        while ((str = br.readLine()) != null) {
+            json = JSONObject.parseObject(str);
+        }
+        //关闭流
+        is.close();
+        //断开连接，最好写上，disconnect是在底层tcp socket链接空闲时才切断。如果正在被其他线程使用就不切断。
+        //固定多线程的话，如果不disconnect，链接会增多，直到收发不出信息。写上disconnect后正常一些。
+        conn.disconnect();
+        String token = json != null ? json.getString("access_token") : "";
+        String postUrlString = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=" + token;
+        URL postUrl = new URL(postUrlString);
+        HttpURLConnection postConn = (HttpURLConnection) postUrl.openConnection();
+        //请求方式 这里设置你需要请求的方式
+        postConn.setRequestMethod("POST");
+        //设置通用的请求属性
+        postConn.setRequestProperty("accept", "*/*");
+        postConn.setRequestProperty("connection", "Keep-Alive");
+        //  这里设置请求头
+        postConn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+        //设置是否向httpUrlConnection输出，设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个
+        //最常用的Http请求无非是get和post，get请求可以获取静态页面，也可以把参数放在URL字串后面，传递给servlet，
+        //post与get的 不同之处在于post的参数不是放在URL字串里面，而是放在http请求的正文内。
+        postConn.setDoOutput(true);
+        postConn.setDoInput(true);
+        //设置body内的参数，put到JSONObject中
+        JSONObject param = new JSONObject();
+        param.put("touser", userString);
+        param.put("agentid", 1000016);
+        JSONObject text = new JSONObject();
+        text.put("content", message);
+        param.put("markdown", text);
+        param.put("msgtype", "markdown");
+        // 得到请求的输出流对象
+        OutputStream outputStream = postConn.getOutputStream();
+        outputStream.write(param.toString().getBytes());
+        outputStream.flush();
+        outputStream.close();
+        //获取URLConnection对象对应的输入流
+        InputStream postIs = postConn.getInputStream();
+        //构造一个字符流缓存
+        BufferedReader postBr = new BufferedReader(new InputStreamReader(postIs));
+        String postStr = "";
+        JSONObject postJson = null;
+        while ((postStr = postBr.readLine()) != null) {
+            postJson = JSONObject.parseObject(postStr);
+        }
+        Integer errcode = postJson != null ? postJson.getInteger("errcode") : null;
+        if (errcode != null && errcode == 0)
+            System.out.println("应用消息发送成功");
+        else
+            System.out.println("应用消息发送失败");
+        //关闭流
+        postIs.close();
+        //断开连接，最好写上，disconnect是在底层tcp socket链接空闲时才切断。如果正在被其他线程使用就不切断。
+        //固定多线程的话，如果不disconnect，链接会增多，直到收发不出信息。写上disconnect后正常一些。
+        postConn.disconnect();
+    }
+
+    public static void sendAppMessage(String message, String userString) throws IOException {
+        sendMessage(message, userString);
+    }
+}

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

@@ -41,10 +41,10 @@ public class SysPostController extends BaseController
     private ISysPostService postService;
 
     @Autowired
-    private ISysUserService userService;
+    private static ISysUserService userService;
 
     @Autowired
-    private ICmcManageDeptService cmcManageDeptService;
+    private static ICmcManageDeptService cmcManageDeptService;
 
     /**
      * 获取岗位列表
@@ -165,7 +165,7 @@ public class SysPostController extends BaseController
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId().toString(), ""));
+        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId().toString(), null));
     }
 
     /**
@@ -267,7 +267,7 @@ public class SysPostController extends BaseController
         return success(posts);
     }
 
-    private List<SysUser> getManageId(String deptId, String partyAId) {
+    public static List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
         CmcManageDept cmcManageDept = new CmcManageDept();
         cmcManageDept.setDeptId(deptId);

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

@@ -8,8 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.IDCard;
+import com.ruoyi.common.utils.*;
 import com.ruoyi.oa.domain.CmcUserHistory;
 import com.ruoyi.oa.service.ICmcUserHistoryService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -34,8 +33,6 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
@@ -300,6 +297,8 @@ public class SysUserController extends BaseController
             return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
+        String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
+        user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         if (user.getBirthday() != null)
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
@@ -320,7 +319,25 @@ public class SysUserController extends BaseController
                 userService.resetPwd(user);
             }
         }
-        return toAjax(userService.selectUserList(new SysUser()).size() - 15);
+        return toAjax(1);
+    }
+
+    /**
+     * 修改用户密码
+     */
+//    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/pinyin")
+    public AjaxResult setPinyin()
+    {
+        for (SysUser user : userService.selectUserList(new SysUser())) {
+            if (user.getUserId() > 1) {
+                String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
+                user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
+                userService.updateUser(user);
+            }
+        }
+        return toAjax(1);
     }
 
     /**

oa-back/ruoyi-common/pom.xml

@@ -126,6 +126,11 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.0</version>
+        </dependency>
     </dependencies>
 
 </project>

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -38,6 +38,9 @@ public class SysUser extends BaseEntity
     @Excel(name = "用户名称")
     private String nickName;
 
+    /** 用户拼音 */
+    private String pinyin;
+
     /** 用户邮箱 */
 //    @Excel(name = "用户邮箱")
     private String email;
@@ -231,6 +234,16 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
+    public String getPinyin()
+    {
+        return pinyin;
+    }
+
+    public void setPinyin(String pinyin)
+    {
+        this.pinyin = pinyin;
+    }
+
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Pinyin4jUtil.java

@@ -0,0 +1,192 @@
+package com.ruoyi.common.utils;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+
+import java.util.HashSet;
+import java.util.Set;
+public class Pinyin4jUtil {
+
+    //将汉字转换为拼音全拼 首字母大写，多音字的返回多个拼音以逗号分隔
+    public static String getPinyin(String chinese) {
+        return getPinyinZh_CN(makeStringByStringSet(chinese));
+    }
+
+    //将汉字转换为拼音全拼 大写，多音字的返回多个拼音以逗号分隔
+    public static String getPinyinToUpperCase(String chinese) {
+        return getPinyinZh_CN(makeStringByStringSet(chinese)).toUpperCase();
+    }
+
+    //将汉字转换为拼音全拼 小写，多音字的返回多个拼音以逗号分隔
+    public static String getPinyinToLowerCase(String chinese) {
+        return getPinyinZh_CN(makeStringByStringSet(chinese)).toLowerCase();
+    }
+
+    //将汉字转换为拼音简拼 大写，多音字的返回多个拼音以逗号分隔
+    public static String getPinyinJianPin(String chinese) {
+        String[] strArray = getPinyin(chinese).split(",");
+        String strChar = "";
+        for (String str : strArray) {
+            char arr[] = str.toCharArray(); // 将字符串转化成char型数组
+            for (int i = 0; i < arr.length; i++) {
+                if (arr[i] >= 65 && arr[i] < 91) { // 判断是否是大写字母
+                    strChar += new String(arr[i] + "");
+                }
+            }
+            strChar += ",";
+        }
+        return strChar.substring(0,strChar.length()-1);
+    }
+
+    //字符集转换
+    public static Set<String> makeStringByStringSet(String chinese) {
+        char[] chars = chinese.toCharArray();
+        if (chinese != null && !chinese.trim().equalsIgnoreCase("")) {
+            char[] srcChar = chinese.toCharArray();
+            String[][] temp = new String[chinese.length()][];
+            for (int i = 0; i < srcChar.length; i++) {
+                char c = srcChar[i];
+
+                // 是中文或者a-z或者A-Z转换拼音
+                if (String.valueOf(c).matches("[\\u4E00-\\u9FA5]+")) {
+
+                    try {
+                        temp[i] = PinyinHelper.toHanyuPinyinStringArray(
+                                chars[i], getDefaultOutputFormat());
+
+                    } catch (BadHanyuPinyinOutputFormatCombination e) {
+                        e.printStackTrace();
+                    }
+                } else if (((int) c >= 65 && (int) c <= 90)
+                        || ((int) c >= 97 && (int) c <= 122)) {
+                    temp[i] = new String[] { String.valueOf(srcChar[i]) };
+                } else {
+                    temp[i] = new String[] { "" };
+                }
+            }
+            String[] pingyinArray = Exchange(temp);
+            Set<String> zhongWenPinYin = new HashSet<String>();
+            for (int i = 0; i < pingyinArray.length; i++) {
+                zhongWenPinYin.add(pingyinArray[i]);
+            }
+            return zhongWenPinYin;
+        }
+        return null;
+    }
+
+    //默认输出格式
+    public static HanyuPinyinOutputFormat getDefaultOutputFormat() {
+        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
+        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);// 小写
+        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 没有音调数字
+        format.setVCharType(HanyuPinyinVCharType.WITH_U_AND_COLON);// u显示
+        return format;
+    }
+
+    public static String[] Exchange(String[][] strJaggedArray) {
+        String[][] temp = DoExchange(strJaggedArray);
+        return temp[0];
+    }
+
+    private static String[][] DoExchange(String[][] strJaggedArray) {
+        int len = strJaggedArray.length;
+        if (len >= 2) {
+            int len1 = strJaggedArray[0].length;
+            int len2 = strJaggedArray[1].length;
+            int newlen = len1 * len2;
+            String[] temp = new String[newlen];
+            int Index = 0;
+            for (int i = 0; i < len1; i++) {
+                for (int j = 0; j < len2; j++) {
+                    temp[Index] = capitalize(strJaggedArray[0][i])
+                            + capitalize(strJaggedArray[1][j]);
+                    Index++;
+                }
+            }
+            String[][] newArray = new String[len - 1][];
+            for (int i = 2; i < len; i++) {
+                newArray[i - 1] = strJaggedArray[i];
+            }
+            newArray[0] = temp;
+            return DoExchange(newArray);
+        } else {
+            return strJaggedArray;
+        }
+    }
+
+    //首字母大写
+    public static String capitalize(String s) {
+        char ch[];
+        ch = s.toCharArray();
+        if (ch[0] >= 'a' && ch[0] <= 'z') {
+            ch[0] = (char) (ch[0] - 32);
+        }
+        String newString = new String(ch);
+        return newString;
+    }
+
+    //字符串集合转换字符串(逗号分隔)
+    public static String getPinyinZh_CN(Set<String> stringSet) {
+        StringBuilder str = new StringBuilder();
+        int i = 0;
+        for (String s : stringSet) {
+            if (i == stringSet.size() - 1) {
+                str.append(s);
+            } else {
+                str.append(s + ",");
+            }
+            i++;
+        }
+        return str.toString();
+    }
+
+    // 将汉字转换为全拼 小写 不识别多音字
+    public static String getPingYin(String src) {
+        char[] t1 = null;
+        t1 = src.toCharArray();
+        String[] t2 = new String[t1.length];
+        HanyuPinyinOutputFormat t3 = new HanyuPinyinOutputFormat();
+
+        t3.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+        t3.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+        t3.setVCharType(HanyuPinyinVCharType.WITH_V);
+        String t4 = "";
+        int t0 = t1.length;
+        try {
+            for (int i = 0; i < t0; i++) {
+                // 判断是否为汉字字符
+                if (java.lang.Character.toString(t1[i]).matches(
+                        "[\\u4E00-\\u9FA5]+")) {
+                    t2 = PinyinHelper.toHanyuPinyinStringArray(t1[i], t3);
+                    t4 += t2[0];
+                } else
+                    t4 += java.lang.Character.toString(t1[i]);
+            }
+            // System.out.println(t4);
+            return t4;
+        } catch (BadHanyuPinyinOutputFormatCombination e1) {
+            e1.printStackTrace();
+        }
+        return t4;
+    }
+
+    // 汉字转拼音 小写首字母 不识别多音字
+    public static String getPinYinHeadChar(String str) {
+        String convert = "";
+        for (int j = 0; j < str.length(); j++) {
+            char word = str.charAt(j);
+            String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(word);
+            if (pinyinArray != null) {
+                convert += pinyinArray[0].charAt(0);
+            } else {
+                convert += word;
+            }
+        }
+        return convert;
+    }
+}
+

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

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amount != null "> and mb.amount = #{amount}</if>
             <if test="buyer != null "> and mb.buyer = #{buyer}</if>
         </where>
+        order by mb.buy_time desc
     </select>
     
     <select id="selectCmcMaterialBuyByBuyId" parameterType="Integer" resultMap="CmcMaterialBuyResult">

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

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useDept != null "> and mg.use_dept = #{useDept}</if>
             <if test="giveNum != null "> and mg.give_num = #{giveNum}</if>
         </where>
+        order by mg.give_time desc
     </select>
     
     <select id="selectCmcMaterialGiveByGiveId" parameterType="Integer" resultMap="CmcMaterialGiveResult">

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
+        <result property="pinyin"     	column="pinyin"    />
         <result property="email"        column="email"        />
         <result property="phonenumber"  column="phonenumber"  />
         <result property="sex"          column="sex"          />
@@ -76,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.pinyin, u.email, u.avatar, u.phonenumber, u.password,
                u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level,
                u.operator_level, u.entry_date, u.birthday, u.age, u.id_card, u.native_place, u.political_affiliation,
@@ -91,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
+		select u.user_id, u.dept_id, u.nick_name, u.pinyin, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
 		       u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason,
 		       u.engineer_level, u.post_level, u.salary_level, u.operator_level, u.entry_date, u.birthday, u.age, u.id_card,
 		       u.native_place, u.political_affiliation, u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire,
@@ -232,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="contractSign != null">contract_sign,</if>
 			<if test="contractExpire != null">contract_expire,</if>
 			<if test="homePlace != null">home_place,</if>
+			<if test="pinyin != null">pinyin,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -267,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="contractSign != null">#{contractSign},</if>
 			<if test="contractExpire != null">#{contractExpire},</if>
 			<if test="homePlace != null">#{homePlace},</if>
+			<if test="pinyin != null">#{pinyin},</if>
  			sysdate()
  		)
 	</insert>
@@ -308,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			contract_sign = #{contractSign},
 			contract_expire = #{contractExpire},
 			<if test="homePlace != null">home_place = #{homePlace},</if>
+			<if test="pinyin != null">pinyin = #{pinyin},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-21 14:36:48
+ * @LastEditTime: 2024-08-23 17:20:57
 -->
 <template>
   <div class="warpper-container">
@@ -99,52 +99,53 @@
                 <div class="expand-info">
                   <el-descriptions :column="2">
                     <el-descriptions-item label="存放地址" class="desLabel" :span="2">
-                      {{ props.row.storageAddress == '' || props.row.storageAddress == undefined ? '暂无' :
+                      {{ props.row.storageAddress == '' || props.row.storageAddress == null ? '暂无' :
                         props.row.storageAddress
                       }}
                     </el-descriptions-item>
-                    <el-descriptions-item label="甲方单位" class="desLabel" :span="2">{{ props.row.partyA.partyAName == ''
+                    <el-descriptions-item label="甲方单位" class="desLabel" :span="2">{{ props.row.partyA == null
                       ? '暂无' :
                       props.row.partyA.partyAName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="联系人" class="desLabel">{{ props.row.contactPerson == '' ? '暂无' :
+                    <el-descriptions-item label="联系人" class="desLabel">{{ props.row.contactPerson == null ? '暂无' :
                       props.row.contactPerson
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="联系电话" class="desLabel">{{ props.row.telephone == '' ? '暂无' :
+                    <el-descriptions-item label="联系电话" class="desLabel">{{ props.row.telephone == null ? '暂无' :
                       props.row.telephone
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目类型" class="desLabel">{{ props.row.projectType == '' ? '暂无' :
+                    <el-descriptions-item label="项目类型" class="desLabel">{{ props.row.projectType == null ? '暂无' :
                       props.row.projectType
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="技术负责人" class="desLabel">{{ props.row.technicalDirector == '' ? '暂无'
+                    <el-descriptions-item label="技术负责人" class="desLabel">{{ props.row.technicalDirectorUser == null ? '暂无'
                       :
-                      getUserName(props.row.technicalDirector)
+                      props.row.technicalDirectorUser.nickName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="技术设计人" class="desLabel">{{ props.row.techinicalDesigner == '' ? '暂无'
+                    <el-descriptions-item label="技术设计人" class="desLabel">{{ props.row.technicalDesignerUser == null ? '暂无'
                       :
-                      getUserName(props.row.techinicalDesigner)
+                      props.row.technicalDesignerUser.nickName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="承担部门" class="desLabel">{{ props.row.undertakingSector == '' ? '暂无' :
+                    <el-descriptions-item label="承担部门" class="desLabel">{{ props.row.undertakingSector == null ? '暂无' :
                       props.row.undertakingDeptName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="质量检察员" class="desLabel">{{ props.row.qualityInspector == '' ? '暂无' :
-                      getUserNames(props.row.qualityInspector)
+                    <el-descriptions-item label="质量检查员" class="desLabel">{{ props.row.qualityInspectorName == null ? '暂无'
+                      :
+                      props.row.qualityInspectorName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目登记时间" class="desLabel" :span="2">{{ props.row.registrationDate ==
-                      '' ? '暂无' :
-                      props.row.registrationDate
+                    <el-descriptions-item label="项目登记时间" class="desLabel" :span="2">{{ props.row.registerTime ==
+                      null ? '暂无' :
+                      props.row.registerTime
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目登记人" class="desLabel">{{ props.row.projectRegistrant == '' ? '暂无'
+                    <el-descriptions-item label="项目登记人" class="desLabel">{{ props.row.projectRegistrantUser == null ? '暂无'
                       :
-                      getUserName(props.row.projectRegistrant)
+                      props.row.projectRegistrantUser.nickName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="进场时间" class="desLabel">{{ props.row.approachTime == '' ? '暂无' :
-                      props.row.approachTime
+                    <el-descriptions-item label="进场时间" class="desLabel">{{ props.row.approachTime == null ? '暂无' :
+                      props.row.entryTime
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="撤场时间" class="desLabel">{{ props.row.withdrawalTime == '' ? '暂无' :
-                      props.row.withdrawalTime
+                    <el-descriptions-item label="撤场时间" class="desLabel">{{ props.row.withdrawalTime == null ? '暂无' :
+                      props.row.exitTime
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目要求完成时间" class="desLabel">{{ props.row.requiredCompletionDate == ''
+                    <el-descriptions-item label="项目要求完成时间" class="desLabel">{{ props.row.requiredCompletionDate == null
                       ? '暂无' :
                       props.row.requiredCompletionDate
                     }}</el-descriptions-item>
@@ -373,7 +374,7 @@ export default {
         view: this.view,
       })
       this.map.addOverlay(this.popup);
-      this.mapClick(this.map, this.popup);
+      this.mapClick(this.map);
       // this.clickFeacturePopInfo();
       this.addKeyDownFun()
     },
@@ -411,7 +412,7 @@ export default {
       });
     },
     // 地图点击事件
-    mapClick(map, popup) {
+    mapClick(map) {
       let that = this;
       map.on('singleclick', function (evt) {
         if (!that.isDrawing) {
@@ -436,15 +437,15 @@ export default {
                   // 假设 this 在这里指向 Vue 组件实例或其他上下文  
                   that.clickFeature = res.data;
                   that.clickFeature.type = 'projectPoint';
-                  popup.setPosition(coordinate);
+                  this.popup.setPosition(coordinate);
                 }
               })
             } else {
               // 如果有多个特征，这里可以根据需要处理  
-              popup.setPosition(undefined);
+              this.popup.setPosition(undefined);
             }
           } else {
-            popup.setPosition(undefined);
+            this.popup.setPosition(undefined);
           }
 
 

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-05 14:36:35
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-23 15:59:39
 -->
 <template>
   <div class="app-container">
@@ -240,7 +240,7 @@ export default {
       })
     },
     confirmPlanForm() {
-      this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
+      this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底三个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'