搬运工对账单及用户管理

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -103,7 +103,13 @@ public interface ISysBaseAPI {
    	 * @return
    	 */
    	public List<DictModel> queryAllDepartBackDictModel();
-   	
+
+    /**
+   	 * 查询所有用户 作为字典信息 username -->value,realname -->text
+   	 * @return
+   	 */
+   	public List<DictModel> queryAllUserBackDictModel();
+
 	/**
 	 * 发送系统消息
 	 * @param fromUser 发送人(用户登录账户)

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerMeeting.java

@@ -74,21 +74,33 @@ public class ListenerMeeting implements TaskListener, JavaDelegate {
 	}
 
 	public static void main(String[] args) {
-		String ss = "[\"lisi\",\"admin\",\"wxs\",\"T0116\",\"T0007\"]";
-
-		String dmf = ss.replace("[","");
-		String dmf2 = dmf.replace("]","");
-
-		String[] ssa = dmf2.split(",");
-		System.out.println(ssa);
-
-
-		System.out.println(dmf2);
-		List<String> aa = new ArrayList<>();
-		aa.add(0,"223232");
-		aa.add(1,"223232");
-
+		String ss = "1[\"lisi\",\"admin\",\"wxs\",\"T0116\",\"T0007\"]";
+		String[] aa = StringUtils.splitByCharacterType(ss);
+		String[] aa2 = StringUtils.splitByCharacterTypeCamelCase(ss);
 		System.out.println(aa);
+		System.out.println(aa2);
+
+		System.out.println(ss.startsWith("["));
+		System.out.println(ss.endsWith("]"));
+//
+//		String dmf = ss.replace("[","");
+//		String dmf2 = dmf.replace("]","");
+//
+//		String[] ssa = dmf2.split(",");
+//		System.out.println(ssa);
+//
+//
+//		System.out.println(dmf2);
+//		List<String> aa = new ArrayList<>();
+//		aa.add(0,"223232");
+//		aa.add(1,"223232");
+//			List<String> list = new ArrayList<>();
+//			list.add("1");
+//			list.add("a");
+//			list.add("3");
+//			list.add("c");
+//			System.out.println(StringUtils.join(list, ","));
+//			System.out.println(StringUtils.join(list, ""));
 	}
 
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/CdSchedule.java

@@ -56,6 +56,12 @@ public class CdSchedule {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
 	private Date endTime;
+	/**计划时间*/
+	@Excel(name = "计划时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "计划时间")
+	private Date planTime;
 	/**参与人id*/
 	@Excel(name = "参与人id", width = 15)
     @ApiModelProperty(value = "参与人id")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/SyCertificates.java

@@ -99,4 +99,8 @@ public class SyCertificates {
 	@Excel(name = "删除标记", width = 15)
     @ApiModelProperty(value = "删除标记")
 	private String delFlag;
+	/**是否公开(是 否)*/
+	@Excel(name = "是否公开(是 否)", width = 15)
+    @ApiModelProperty(value = "是否公开(是 否)")
+	private String isOpen;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/SyCarryServiceImpl.java

@@ -43,6 +43,22 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 		for(SyCarryB entity:syCarryBList) {
 			//外键设置
 			entity.setHeadId(syCarry.getId());
+			if(StringUtils.isNotBlank(entity.getJhyByData())){
+				String[] ids = entity.getJhyByData().split(",");
+				StringBuffer sb = new StringBuffer();
+				for (String o:ids){
+					LoginUser user = iSysBaseAPI.getUserByName(o);
+					if(user != null){
+						if(StringUtils.isBlank(sb.toString())){
+							sb.append(user.getRealname());
+						}else{
+							sb.append("/").append(user.getRealname());
+						}
+
+					}
+				}
+				entity.setJhyNameData(sb.toString());
+			}
 			syCarryBMapper.insert(entity);
 		}
 	}
@@ -59,6 +75,22 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 		for(SyCarryB entity:syCarryBList) {
 			//外键设置
 			entity.setHeadId(syCarry.getId());
+			if(StringUtils.isNotBlank(entity.getJhyByData())){
+				String[] ids = entity.getJhyByData().split(",");
+				StringBuffer sb = new StringBuffer();
+				for (String o:ids){
+					LoginUser user = iSysBaseAPI.getUserByName(o);
+					if(user != null){
+						if(StringUtils.isBlank(sb.toString())){
+							sb.append(user.getRealname());
+						}else{
+							sb.append("/").append(user.getRealname());
+						}
+
+					}
+				}
+				entity.setJhyNameData(sb.toString());
+			}
 			syCarryBMapper.insert(entity);
 		}
 	}
@@ -213,10 +245,15 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 		List<SyCarryB> syCarryB2 = syCarryBMapper.selectByMainId(syCarryB.getHeadId());
 		boolean ifAll = true;
 		for(SyCarryB o:syCarryB2){
+			if(StringUtils.isBlank(o.getJhyBy())){
+				ifAll = false;
+				break;
+			}
 			String[] jhy = o.getJhyBy().split("/");
-			String[] jhyData = o.getJhyByData().split("/");
+			String[] jhyData = o.getJhyByData().split(",");
 			if(jhyData.length != jhy.length){
 				ifAll = false;
+				break;
 			}
 		}
 		if(ifAll){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -62,7 +62,7 @@
 	<select id="queryAllUserBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
 		select username as "value",realname as "text" from sys_user where del_flag = '0'
 	</select>
-	
+
 	<!--通过查询指定table的 text code 获取字典数据，且支持关键字查询 -->
 	<select id="queryTableDictItems" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
 		select ${text} as "text",${code} as "value" from ${table} where ${text} like #{keyword}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -209,6 +209,11 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return sysDictService.queryAllDepartBackDictModel();
 	}
 
+	@Override
+	public List<DictModel> queryAllUserBackDictModel() {
+		return sysDictService.queryAllUserBackDictModel();
+	}
+
 	@Override
 	public void sendSysAnnouncement(LoginUser loginUser,String fromUser, String toUser, String title, String msgContent,Map<String,Object> map) {
 		this.sendSysAnnouncement(loginUser,fromUser, toUser, title, msgContent, CommonConstant.MSG_CATEGORY_2,map);