anderx лет назад: 2
Родитель
Сommit
1b9863836f

+ 5 - 1
pom.xml

@@ -444,7 +444,11 @@
 			<version>2.5.3</version>
 			<type>pom</type>
 		</dependency>
-
+		<dependency>
+			<groupId>com.belerweb</groupId>
+			<artifactId>pinyin4j</artifactId>
+			<version>2.5.1</version>
+		</dependency>
 
 	</dependencies>
 	<build>

+ 10 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -819,7 +819,7 @@
 
   <select id="ExpenseMainList" resultMap="MainMap">
     select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
-    date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
+    date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
     dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid ,
     c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount,c.`type` sonType,c.type_other sonTypeOTher,
     c.user_names ,c.release_start ,c.release_end, c.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
@@ -846,6 +846,12 @@
     </if>
     <if test=" roleType ==0">
       and b.aid = #{aid}
+      <if test="listStatus ==0">
+        and b.status >0
+      </if>
+      <if test="listStatus ==1">
+        and b.status =2
+      </if>
     </if>
     <if test="roleType == 1">
       <if test="listStatus ==0">
@@ -875,6 +881,9 @@
     <if test="roleType == 5">
       and adDep.finance_id  in (select id from admin where superior_id = #{aid})
     </if>
+    <if test="startTime !=null and endTime !=null ">
+      and b.create_time between #{startTime} and #{endTime}
+    </if>
   </sql>
   <select id="ExpenseMainCount" resultType="java.lang.Integer">
     select count(*)

+ 2 - 0
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -95,6 +95,7 @@
     left join role_permission trp on trp.rid=tr.id
     left join permission tp on tp.id=trp.pid
     where tr.role_type <![CDATA[ < ]]> 999999
+    order by CONVERT(tr.role_name USING gbk)
   </select>
   <select id="findRolePermissionsExceptAreaManager" resultType="com.goafanti.permission.bo.RolePermissionBo">
     select tr.id as rid, tr.role_name as rname, tr.role_type,tp.id as pid,tp.name as pname,tp.url
@@ -102,6 +103,7 @@
     left join role_permission trp on trp.rid=tr.id
     left join permission tp on tp.id=trp.pid
     where tr.role_type <![CDATA[ < ]]> 99999
+    order by CONVERT(tr.role_name USING gbk)
   </select>
   <select id="findRoleByUserId" resultType="java.lang.String">
     select tr.role_type from role tr

+ 17 - 0
src/main/java/com/goafanti/expenseAccount/bo/ExpenseMainListInput.java

@@ -8,6 +8,8 @@ public class ExpenseMainListInput {
      */
     private Integer status;
     private Integer checkNo;
+    private String startTime;
+    private String endTime;
 
 
     /**
@@ -19,6 +21,21 @@ public class ExpenseMainListInput {
      */
     private Integer processStatus;
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public Integer getCheckNo() {
         return checkNo;

+ 10 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -527,9 +527,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 //获取报销申请人
                 status =2;
                 Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
+                //同事添加通知财务管理员与公司副总
+                List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.FINANCE_ADMIN);
+                aids.addAll(admins);
+                List<Admin> viceCEO = adminMapper.selectAdminByRoleType(AFTConstants.VICE_CEO);
+                aids.addAll(viceCEO);
                 aids.add(finaceAdmin);
                 str.setLength(0);
-                str=str.append("您的报销审核已通过,报销编号[").append(in.getId()).append("],请注意查看。");
+                str=str.append("报销编号[").append(in.getId()).append("]审核已通过,请注意查看。");
                 addNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
                 aids.clear();
                 aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
@@ -814,6 +819,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getStatus()!=null) params.put("status",in.getStatus());
         if (in.getCheckNo()!=null) params.put("checkNo",in.getCheckNo());
         if (in.getListStatus()!=null) params.put("listStatus",in.getListStatus());
+        if (in.getStartTime()!=null && in.getEndTime() !=null) {
+            params.put("startTime",in.getStartTime());
+            params.put("endTime",in.getEndTime()+" 23:59:59");
+        }
         //1-3s是不同人的审核
         if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
              if (TokenManager.hasRole(AFTConstants.FINANCE)){

+ 25 - 11
src/main/java/com/goafanti/permission/service/impl/RoleServiceImpl.java

@@ -1,14 +1,5 @@
 package com.goafanti.permission.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.RoleMapper;
 import com.goafanti.common.dao.RolePermissionMapper;
@@ -23,6 +14,13 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.permission.bo.RoleBo;
 import com.goafanti.permission.bo.RolePermissionBo;
 import com.goafanti.permission.service.RoleService;
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleService {
@@ -49,7 +47,6 @@ public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleS
 		} else {
 			 res = roleMapper.findRolePermissions();
 		}
-		
 		Map<String, RoleBo> roleMap = new HashMap<>();
 		for (RolePermissionBo rp : res) {
 			RoleBo rb = roleMap.get(rp.getRid());
@@ -68,7 +65,24 @@ public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleS
 				rb.getPermissions().add(p);
 			}
 		}
-		return new ArrayList<>(roleMap.values());
+		ArrayList<RoleBo> roleBos = new ArrayList<>(roleMap.values());
+		return listSrot(roleBos);
+	}
+
+	private List<RoleBo> listSrot(ArrayList<RoleBo> roleBos) {
+		HanyuPinyinOutputFormat format=new HanyuPinyinOutputFormat();
+		Collections.sort(roleBos, (o1, o2) -> {
+			String str1=null;
+			String str2=null;
+			try {
+				str1= PinyinHelper.toHanYuPinyinString(o1.getRoleName(),format," ",true);
+				str2= PinyinHelper.toHanYuPinyinString(o2.getRoleName(),format," ",true);
+			} catch (BadHanyuPinyinOutputFormatCombination e) {
+				throw new RuntimeException(e);
+			}
+			return str1.compareTo(str2);
+		});
+		return roleBos;
 	}
 
 	@Override