1.内部通知默认给出有表单权限的人员

2.货票表单表格长度固定功能

common/src/main/java/com/jpsoft/railroad/modules/base/dao/RegUserDAO.java

@@ -29,4 +29,5 @@ public interface RegUserDAO {
 	List<RegUser> findByOrg(String orgId);
 	List<RegUser> findByOrgIdAndRoleId(String orgId,String roleId);
 	List<RegUser> findByRecharge();
+	List<RegUser> findByIsForm();
 }

common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeService.java

@@ -10,6 +10,7 @@ public interface NetworkNoticeService {
 	NetworkNotice get(String id);
 	boolean exist(String id);
 	int insert(NetworkNotice model);
+	int insertRelation(NetworkNotice model);
 	int update(NetworkNotice model);
 	int delete(String id);
 	List<NetworkNotice> list();

common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeServiceImpl.java

@@ -1,9 +1,16 @@
 package com.jpsoft.railroad.modules.base.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
+
+import com.jpsoft.railroad.modules.base.dao.RegUserDAO;
+import com.jpsoft.railroad.modules.base.dto.NetworkNoticeRalationDTO;
+import com.jpsoft.railroad.modules.base.entity.RegUser;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeRalationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.jpsoft.railroad.modules.base.dao.NetworkNoticeDAO;
@@ -14,66 +21,99 @@ import com.jpsoft.railroad.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional
-@Component(value="networkNoticeService")
+@Component(value = "networkNoticeService")
 public class NetworkNoticeServiceImpl implements NetworkNoticeService {
-	@Resource(name="networkNoticeDAO")
-	private NetworkNoticeDAO networkNoticeDAO;
-
-	@Override
-	public NetworkNotice get(String id) {
-		// TODO Auto-generated method stub
-		return networkNoticeDAO.get(id);
-	}
-
-	@Override
-	public int insert(NetworkNotice model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return networkNoticeDAO.insert(model);
-	}
-
-	@Override
-	public int update(NetworkNotice model) {
-		// TODO Auto-generated method stub
-		return networkNoticeDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return networkNoticeDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = networkNoticeDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<NetworkNotice> list() {
-		// TODO Auto-generated method stub
-		return networkNoticeDAO.list();
-	}
-		
-	@Override
-	public Page<NetworkNotice> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<NetworkNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            networkNoticeDAO.search(searchParams,sortList);
+    @Resource(name = "networkNoticeDAO")
+    private NetworkNoticeDAO networkNoticeDAO;
+
+    @Resource(name = "regUserDAO")
+    private RegUserDAO regUserDAO;
+
+    @Autowired
+    private NetworkNoticeRalationService networkNoticeRalationService;
+
+    @Override
+    public NetworkNotice get(String id) {
+        // TODO Auto-generated method stub
+        return networkNoticeDAO.get(id);
+    }
+
+    @Override
+    public int insert(NetworkNotice model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
+
+        return networkNoticeDAO.insert(model);
+    }
+
+    @Override
+    public int insertRelation(NetworkNotice model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
+        int affectCount = networkNoticeDAO.insert(model);
+
+        if (affectCount > 0) {
+            List<RegUser> regUserList = regUserDAO.findByIsForm();
+
+            String[] relatedUse = new String[regUserList.size()];
+
+            for (int i = 0; i < regUserList.size(); i++) {
+                relatedUse[i] = regUserList.get(i).getId();
+            }
+
+            NetworkNoticeRalationDTO dto = new NetworkNoticeRalationDTO();
+            dto.setFileId(model.getId());
+            dto.setRelatedUser(relatedUse);
+            dto.setOrgSelected(new String[0]);
+
+            networkNoticeRalationService.relationItem(dto, model.getCreateBy());
+        }
+
+        return affectCount;
+    }
+
+
+    @Override
+    public int update(NetworkNotice model) {
+        // TODO Auto-generated method stub
+        return networkNoticeDAO.update(model);
+    }
+
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return networkNoticeDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = networkNoticeDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<NetworkNotice> list() {
+        // TODO Auto-generated method stub
+        return networkNoticeDAO.list();
+    }
+
+    @Override
+    public Page<NetworkNotice> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
+        Page<NetworkNotice> page = PageHelper.startPage(pageNumber, pageSize, count).doSelectPage(() -> {
+            networkNoticeDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 
-	@Override
-	public Page<NetworkNotice> pageSearchByMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-		Page<NetworkNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			networkNoticeDAO.searchByMobile(searchParams,sortList);
-		});
+    @Override
+    public Page<NetworkNotice> pageSearchByMobile(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
+        Page<NetworkNotice> page = PageHelper.startPage(pageNumber, pageSize, count).doSelectPage(() -> {
+            networkNoticeDAO.searchByMobile(searchParams, sortList);
+        });
 
-		return page;
-	}
+        return page;
+    }
 }

common/src/main/resources/mapper/base/RegUser.xml

@@ -220,4 +220,9 @@
         AND b.status_ = 1
         GROUP BY a.phone_
     </select>
+    <select id="findByIsForm" parameterType="hashmap" resultMap="RegUserMap">
+        SELECT * FROM base_reg_user
+        WHERE del_flag = 0
+        AND is_form_permissions = true
+    </select>
 </mapper>

web/src/main/java/com/jpsoft/railroad/modules/base/controller/NetworkNoticeController.java

@@ -78,7 +78,7 @@ public class NetworkNoticeController {
             }
 
 
-            int affectCount = networkNoticeService.insert(networkNotice);
+            int affectCount = networkNoticeService.insertRelation(networkNotice);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);