Skip to content

S
sunac_report
Commit b33ba283 by sunxin
Options

整体优化测试

parent f18e2721
Showing with 73 additions and 30 deletions
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -406,8 +406,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
report.setTransferName(exchangeAfterUser);
/*封装转换集团信息*/
String supplementGroup = report.getSupplementGroup();
if(StringUtils.isNoneBlank(supplementGroup)){
/* String supplementGroup = report.getSupplementGroup();*/
/* if(StringUtils.isNoneBlank(supplementGroup)){
if("3437402691677202102".equals(supplementGroup)){
report.setSupplementGroup("集团本部");
}else if("3510129313047280678".equals(supplementGroup)){
......@@ -422,11 +422,17 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}else{
report.setSupplementGroup("--");
}
}*/
/*封装拼接移交部门信息*/
String transferGroup = report.getTransferGroup();
if(StringUtils.isNotBlank(report.getTransferGroup()) && StringUtils.isNotBlank(report.getTransferArea()) && StringUtils.isNotBlank(report.getTransferDepartment())){
report.setTransferDepartment(report.getTransferGroup()+"--"+report.getTransferArea()+"--"+report.getTransferDepartment());
}else{
report.setTransferDepartment("--");
}
/* String transferGroup = report.getTransferGroup();
if(StringUtils.isNoneBlank(transferGroup)){
if("3437402691677202102".equals(transferGroup)){
report.setTransferDepartment("集团本部--"+report.getTransferDepartment());
......@@ -442,7 +448,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}else{
report.setTransferDepartment("--");
}
}*/
/*封装类型 类别数据*/
String SupplementTypeStr="";
......@@ -655,7 +661,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
report.setTransferName(exchangeAfterUser);
/*封装转换集团信息*/
String supplementGroup = report.getSupplementGroup();
/* String supplementGroup = report.getSupplementGroup();
if(StringUtils.isNoneBlank(supplementGroup)){
if("3437402691677202102".equals(supplementGroup)){
report.setSupplementGroup("集团本部");
......@@ -671,10 +677,17 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}else{
report.setSupplementGroup("--");
}
}*/
/*封装拼接移交部门信息*/
String transferGroup = report.getTransferGroup();
if(StringUtils.isNotBlank(report.getTransferGroup()) && StringUtils.isNotBlank(report.getTransferArea()) && StringUtils.isNotBlank(report.getTransferDepartment())){
report.setTransferDepartment(report.getTransferGroup()+"--"+report.getTransferArea()+"--"+report.getTransferDepartment());
}else{
report.setTransferDepartment("--");
}
/* String transferGroup = report.getTransferGroup();
if(StringUtils.isNoneBlank(transferGroup)){
if("3437402691677202102".equals(transferGroup)){
report.setTransferDepartment("集团本部--"+report.getTransferDepartment());
......@@ -690,7 +703,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}else{
report.setTransferDepartment("--");
}
}*/
/*封装类型 类别数据*/
......
src/main/java/com/ejweb/modules/report/utils/TimedTask.java
......@@ -19,7 +19,7 @@ public class TimedTask {
@Autowired
private ReportDao reportDao;
@Scheduled(cron="0 0 12 * * ?") //cron表达式 每天下午6点执行
@Scheduled(cron="0 0 12 * * ?") //cron表达式 每天中午12执行
public void job1() {
//获取所有转为线索的举报信息
ReportEntity reportEntity=new ReportEntity();
......
src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java
......@@ -8,6 +8,7 @@ import com.ejweb.core.base.BaseController;
import com.ejweb.core.persistence.Page;
import com.ejweb.core.utils.StringUtils;
import com.ejweb.modules.report.dao.CtBbtcTypeAreaDao;
import com.ejweb.modules.report.entity.CtBbtcBusType;
import com.ejweb.modules.report.entity.CtBbtcRegion;
import com.ejweb.modules.report.entity.CtBbtcTypeArea;
......@@ -47,6 +48,9 @@ public class CtBbtcBusTypeController extends BaseController {
private CtBbtcBusTypeService ctBbtcBusTypeService;
@Autowired
private CtBbtcTypeAreaDao ctBbtcTypeAreaDao;
@Autowired
private ReportService reportService;
@ModelAttribute
......@@ -72,7 +76,13 @@ public class CtBbtcBusTypeController extends BaseController {
@RequiresPermissions("report:ctBbtcBusType:view")
@RequestMapping(value = "form")
public String form(CtBbtcBusType ctBbtcBusType, Model model) {
/*跟据id查询typeArea表中parentid为id的数据行，动态回显*/
CtBbtcTypeArea ctBbtcTypeArea0 =new CtBbtcTypeArea();
ctBbtcTypeArea0.setParentId(ctBbtcBusType.getId());
List<CtBbtcTypeArea> cloudAreaList = ctBbtcTypeAreaDao.getByParentId(ctBbtcTypeArea0);
model.addAttribute("ctBbtcBusType", ctBbtcBusType);
model.addAttribute("cloudAreaList", cloudAreaList);
return "modules/report/ctBbtcBusTypeForm";
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -518,7 +518,7 @@ public class ReportController extends BaseController {
}*/
/*封装拼接移交集团信息*/
String transferGroup = reportEntity1.getTransferGroup();
/* String transferGroup = reportEntity1.getTransferGroup();
if(StringUtils.isNoneBlank(transferGroup)){
if("3437402691677202102".equals(transferGroup)){
reportEntity1.setTransferGroup("集团本部");
......@@ -534,7 +534,7 @@ public class ReportController extends BaseController {
}else{
reportEntity1.setTransferGroup("--");
}
}*/
if (isAdmin.equals("1") || isAdmin.equals("2")) {
model.addAttribute("ifClue", true);
......
src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusTypeForm.jsp
......@@ -24,11 +24,21 @@
});
});
function addRow(list, idx, tpl, row) {
$(list).append(Mustache.render(tpl, {
function addRow(list1,list2,list3, idx, tpl, row) {
$(list1).append(Mustache.render(tpl, {
idx: idx, delBtn: true, row: row
}));
$(list2 + idx).find("select").each(function () {
$(this).val($(this).attr("data-value"));
});
$(list3 + idx).find("input[type='checkbox'], input[type='radio']").each(function () {
var ss = $(this).attr("data-value").split(',');
for (var i = 0; i < ss.length; i++) {
if ($(this).val() == ss[i]) {
$(this).attr("checked", "checked");
}
}
});
genSeqNo();
}
......@@ -125,7 +135,7 @@
<tr>
<td colspan="7">
<a href="javascript:"
onclick="addRow('#scopeList', scopeRowIdx, scopeTpl);scopeRowIdx = scopeRowIdx + 1;"
onclick="addRow('#scopeList','#supplementGroup','#supplementArea', scopeRowIdx, scopeTpl);scopeRowIdx = scopeRowIdx + 1;"
class="btn">新增使用范围</a></td>
</tr>
</tfoot>
......@@ -175,17 +185,21 @@
</td>
</tr>//-->
</script>
<script type="text/javascript">
var scopeRowIdx = 0,
scopeTpl = $("#scopeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),
scopeTpl = $("#scopeList").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),
scopeTplReadOnly = $("#scopeTplReadOnly").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
/*数据回显=====================*/
$(document).ready(function () {
var data = ${fns:toJson(adjustBill.scopeList)};
var data = ${fns:toJson(cloudAreaList)};
for (var i = 0; i < data.length; i++) {
if (data[i].isCanDelete != null && data[i].isCanDelete == '1') {
addRow('#scopeList', scopeRowIdx, scopeTpl, data[i]);
alert(data[i].group);
addRow('#scopeList','#supplementGroup','#supplementArea', scopeRowIdx, scopeTpl, data[i]);
} else {
addRow('#scopeList', scopeRowIdx, scopeTplReadOnly, data[i]);
addRow('#scopeList','#supplementGroup','#supplementArea', scopeRowIdx, scopeTplReadOnly, data[i]);
}
scopeRowIdx = scopeRowIdx + 1;
}
......
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
......@@ -145,7 +145,6 @@
<c:if test="${user.supplementGroup eq '30721878435509835919'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '30795782242187242020'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '30770202834994792595'}">文旅集团</c:if>--%>
<c:if test="${report.supplementGroup eq null}">--</c:if>
</td>
<td align="center">${report.supplementArea}</td>
<td align="center">${report.supplementType}</td>
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -428,7 +428,17 @@
</div>
</div>
</c:if>
<c:if test="${report.dealResult eq '6'}">
<div id="transferGroupid" class="control-group">
<label class="control-label">移交区域:</label>
<div class="controls">
<form:input id="transferArea" path=""
value="${report.transferArea}"
htmlEscape="false" maxlength="200"
class="input-xlarge"/>
</div>
</div>
</c:if>
<c:if test="${report.dealResult eq '6'}">
<div id="transferDepartmentid" class="control-group">
<label class="control-label">移交部门:</label>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -39,7 +39,7 @@
});
/*加载时 执行跟据集团 搜索下拉信息 解决每次刷新问题*/
getRegion();
getTransferDepartment();
getTranArea();
});
function page(n, s) {
......@@ -638,7 +638,6 @@
<c:if test="${user.supplementGroup eq '30721878435509835919'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '30795782242187242020'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '30770202834994792595'}">文旅集团</c:if>--%>
<c:if test="${report.supplementGroup eq null}">--</c:if>
</td>
<td align="center">${report.supplementArea}</td>
......@@ -684,13 +683,13 @@
<c:if test="${report.dealResult eq '7'}">转为线索</c:if>
</td>
<td align="center">
${report.transferGroup}-- ${report.transferArea}--${report.transferDepartment}
${report.transferGroup} - ${report.transferArea} - ${report.transferDepartment}
<%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%>
<c:if test="${report.transferGroup eq null and report.transferDepartment eq null and report.transferArea eq null}">--</c:if>
<%--<c:if test="${report.transferDepartment eq null}">--</c:if>
<c:if test="${report.transferDepartment eq '1'}">营销</c:if>
<c:if test="${report.transferDepartment eq '2'}">工程</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp
......@@ -40,7 +40,7 @@
/*加载时 执行跟据集团 搜索下拉信息 解决每次刷新问题*/
getRegion();
getTransferDepartment();
getTranArea();
});
function page(n, s) {
......@@ -634,7 +634,6 @@
<c:if test="${user.supplementGroup eq '30721878435509835919'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '30795782242187242020'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '30770202834994792595'}">文旅集团</c:if>--%>
<c:if test="${report.supplementGroup eq null}">--</c:if>
</td>
<td align="center">${report.supplementArea}</td>
<td align="center">${report.supplementType}</td>
......@@ -678,13 +677,12 @@
<c:if test="${report.dealResult eq '7'}">转为线索</c:if>
</td>
<td align="center">
${report.transferGroup}-- ${report.transferArea}--${report.transferDepartment}
${report.transferGroup} - ${report.transferArea} - ${report.transferDepartment}
<%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%>
<c:if test="${report.transferGroup eq null and report.transferDepartment eq null and report.transferArea eq null}">--</c:if>
<%-- <c:if test="${report.transferDepartment eq null}">--</c:if>
<c:if test="${report.transferDepartment eq '1'}">营销</c:if>
<c:if test="${report.transferDepartment eq '2'}">工程</c:if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment