人员选择bug修复

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -132,7 +132,7 @@ public class ReportController extends BaseController {
             String  SupplementTypeStr="";
             String  SupplementCategoryStr="";
 
-            /*遍历集合*/
+            /*遍历集合   转换业务类型  类别 */
 
             if(StringUtils.isNoneBlank(report.getSupplementType())){
                 String[] getSupplementTypeStr = report.getSupplementType().split(",");
@@ -162,6 +162,10 @@ public class ReportController extends BaseController {
                 report.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
             }
 
+            /* 移交人员*/
+            String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
+            report.setTransferName(exchangeAfterUser);
+
         }
 
 
@@ -207,8 +211,8 @@ public class ReportController extends BaseController {
             }
         }*/
 
-       /* String value = "";*/
-        /*for (ReportEntity report : reportlist) {
+     /*   String value = "";
+        for (ReportEntity report : reportlist) {
             if (StringUtils.isNoneBlank(report.getOaarea())) {
                 if (report.getOaarea().equals("North China")) {
                     value = "华北区域公司";
@@ -237,8 +241,8 @@ public class ReportController extends BaseController {
             }
             String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
             report.setTransferName(exchangeAfterUser);
-        }*/
-
+        }
+*/
         page.setList(reportlist);
         String isAdmin = reportService.checkRole(user);
         model.addAttribute("page", page);
@@ -816,7 +820,7 @@ public class ReportController extends BaseController {
             for (User userEntity : page.getList()) {
                 html.append("			<tr>");
                 if (flag.equals("1")) {
-                    html.append("				<td><input type='radio' value='" + userEntity.getId() + "'></td>");
+                    html.append("				<td id='radioBtn'> <input name='user' type='radio' value='" + userEntity.getId() + "'></td>");
                     html.append("				<td>" + i + "</td>");
                     html.append("				<td>" + (userEntity.getNo() == null ? "" : userEntity.getNo()) + "</td>");
                     html.append("				<td>" + (userEntity.getName() == null ? "" : userEntity.getName()) + "</td>");
@@ -843,7 +847,7 @@ public class ReportController extends BaseController {
         }
         html.append("	</tbody>");
         html.append("</table>");
-        html.append("<span id='chooseItem'></span>");
+      /*  html.append("<span id='chooseItem'></span>");*/
         if (page.getList().size() == 0) {
             html.append("	<span style='color: #999999;margin: 20px 0 70px 20px;display: block;'>未查询到相关内容</span>");
         }

src/main/resources/mappings/modules/report/CtBbtcTypeAreaDao.xml

@@ -43,7 +43,8 @@
 				AND a.AREA_ID = #{area}
 			</if>
 		</where>
-		GROUP BY a.parent_id
+		/*GROUP BY a.parent_id*/
+		GROUP BY a.id,a.parent_id,b.label,c.name,d.name
 	</select>
 
 	<select id="findList" resultType="com.ejweb.modules.report.entity.CtBbtcTypeArea">

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -101,8 +101,10 @@
             });
             //选中用户并关闭
             $("#btnConfirm").click(function () {
-                $("#chooseUser").val($("input:radio:checked").parent().next().next().next().html());
-                $("#userId").val($("input:radio:checked").val());
+               // $("#chooseUser").val($("input:radio:checked").parent().next().next().next().html());
+                $("#chooseUser").val($("input[name='user']:checked").parent().next().next().next().html());
+              //  $("#userId").val($("input:radio:checked").val());
+                $("#userId").val($("input[name='user']:checked").val());
                 $("#chooseDiv").hide();
                 $("#fade").hide();
             });
@@ -1380,7 +1382,7 @@
                         <c:if test="${page.list.size()>0}">
                             <c:forEach items="${page.list}" var="user" varStatus="vs">
                                 <tr>
-                                    <td id="radioBtn"><input type="radio" value="${user.id}"></td>
+                                    <td id="radioBtn"><input name='user' type="radio" value="${user.id}"></td>
                                     <td>${vs.count}</td>
                                     <td>${user.no}</td>
                                     <td>${user.name}</td>