mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-12-27 09:19:45 +08:00
parent 73530c35e8 bcae5ea321
commit 2378154032
6 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -4,7 +4,6 @@ import cn.palmte.work.bean.*;
import cn.palmte.work.model.*;
import cn.palmte.work.pojo.ActHisTask;
import cn.palmte.work.service.*;
import cn.palmte.work.utils.DateKit;
import cn.palmte.work.utils.FreeMarkerUtil;
import cn.palmte.work.utils.InterfaceUtil;
import cn.palmte.work.utils.Utils;
@ -24,7 +23,9 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@ -65,6 +66,8 @@ public class ProjectController extends BaseController {
private ProcurementTypeService procurementTypeService;
@Autowired
private ProjectSettleIncomeRepository projectSettleIncomeRepository;
@Autowired
private ProjectRepository projectRepository;
/**
* 项目列表
@ -525,4 +528,17 @@ public class ProjectController extends BaseController {
public void initBinder(WebDataBinder webDataBinder) {
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
}
/**
* 保存项目与用户的关系
*/
@RequestMapping("/checkName")
@ResponseBody
public ResponseMsg checkName(@RequestParam String name) {
Project project = projectRepository.findByProjectName(name);
if (project != null) {
return ResponseMsg.buildFailedMsg("失败");
}
return ResponseMsg.buildSuccessMsg("成功");
}
}

6
src/main/java/cn/palmte/work/service/AccountService.java
View File

@ -6,7 +6,6 @@ import cn.palmte.work.model.*;
import cn.palmte.work.utils.DESCrypto;
import cn.palmte.work.utils.InterfaceUtil;
import cn.palmte.work.utils.StrKit;
import cn.palmte.work.utils.excel.ExportUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@ -20,12 +19,8 @@ import top.jfunc.common.db.bean.Page;
import top.jfunc.common.db.bean.Record;
import top.jfunc.common.db.utils.Pagination;
import javax.servlet.http.HttpServletResponse;
import java.beans.Transient;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
* Created by wang.lin@esstx.cn on 2018/4/20.
@ -63,6 +58,7 @@ public class AccountService {
public Page<Admin> list(Map<String, String> searchInfo, int pageNumber, int pageSize) {
QueryHelper queryHelper = new QueryHelper("*", "sys_user u");
queryHelper.addCondition("u.is_deleted = 0");
queryHelper.addCondition("u.id > 1");
queryHelper.addCondition(searchInfo.containsKey("realName"), "u.real_name like ?", "%" +
searchInfo.get("realName") + "%");
queryHelper.addCondition(searchInfo.containsKey("telephone"), "u.telephone =?", searchInfo.get("telephone"));

8
src/main/resources/static/assets/js/project_budget.js
View File

@ -6,9 +6,11 @@ $(function () {
bindChangeableInput();
$("#saveDraft").click(function () {
$("#saveDraft").attr('disabled',true);
var message = verifyProjectContributionProfitRate();
if (message) {
$("#saveDraft").attr('disabled',false);
layuiAlert(message);
return ;
}
@ -17,17 +19,21 @@ $(function () {
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
$("#saveDraft").attr('disabled',false);
window.confirm('开始日期应早于结束日期');
return;
}
$("#pmsForm").attr("action",base+"/project/budgetEditSave");
$("#pmsForm").submit();
$("#saveDraft").attr('disabled',false);
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
var message = verifyProjectContributionProfitRate();
if (message) {
$("#saveApprove").attr('disabled',false);
layuiAlert(message);
return;
}
@ -35,12 +41,14 @@ $(function () {
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
$("#saveApprove").attr('disabled',false);
window.confirm('开始日期应早于结束日期');
return;
}
$("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
});
});

34
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -60,7 +60,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
<input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
name="name" placeholder="请输入项目名称（20字符以内）" maxlength="20"
value="" required />
</div>
@ -331,30 +331,62 @@
<script src="${base}/assets/js/project_common.js"></script>
<script src="${base}/assets/js/project_estimate.js"></script>
<script>
var result = 0;
$(function () {
calIncomeAndCost();
$("#saveDraft").click(function () {
$("#saveDraft").attr('disabled',true);
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
$("#saveDraft").attr('disabled',false);
window.confirm('开始日期应早于结束日期');
return;
}
checkName();
if (result == 1) {
$("#saveDraft").attr('disabled',false);
window.confirm('项目名称已存在');
return;
}
$("#pmsForm").attr("action","${base}/project/estimateAddSave");
$("#pmsForm").submit();
$("#saveDraft").attr('disabled',false);
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
$("#saveApprove").attr('disabled',false);
window.confirm('开始日期应早于结束日期');
return;
}
checkName();
if (result == 1) {
$("#saveApprove").attr('disabled',false);
window.confirm('项目名称已存在');
return;
}
$("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
});
});
function checkName () {
var name = $("#name").val();
$.ajax({
url: "${base}/project/checkName",
data: {name: name},
type: "post",
dataType: "json",
async: false,
success: function (data) {
result = data.status;
}
});
};
</script>
</@defaultLayout.layout>

4
src/main/resources/templates/admin/project_final_add.ftl
View File

@ -365,13 +365,17 @@
$(function () {
calculateFinal();
$("#saveFinal").click(function () {
$("#saveFinal").attr('disabled',true);
$("#pmsForm").attr("action","${base}/project/final/save");
$("#pmsForm").submit();
$("#saveFinal").attr('disabled',false);
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
$("#pmsForm").attr("action",base+"/project/final/saveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
});
});

6
src/main/resources/templates/admin/project_settle_add.ftl
View File

@ -426,23 +426,29 @@
calculateSettle();
$("#saveSettle").click(function () {
$("#saveSettle").attr('disabled',true);
var result = valid();
console.log(result);
if (result) {
console.log("result: " + result);
$("#pmsForm").attr("action", "${base}/project/settle/save");
$("#pmsForm").submit();
$("#saveSettle").attr('disabled',false);
} else {
$("#saveSettle").attr('disabled',false);
return false;
}
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
var result = valid();
if (result) {
$("#pmsForm").attr("action",base+"/project/settle/saveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
} else {
$("#saveApprove").attr('disabled',false);
return false;
}
});