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

新增项目编号

master
OathK1per 2022-07-20 17:16:21 +08:00
parent 14cf433af2
commit 0bd61986a1
7 changed files with 155 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import top.jfunc.common.db.bean.Page;
import top.jfunc.common.utils.CollectionUtil;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@ -85,7 +87,15 @@ public class ProjectController extends BaseController {
model.put("admin", InterfaceUtil.getAdmin());
model.put("deptList", deptService.findAll());
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
model.put("pager", projectService.list(searchInfo, pageNumber, pageSize));
Page<Project> page = projectService.list(searchInfo, pageNumber, pageSize);
List<Project> list = page.getList();
if(CollectionUtil.isNotEmpty(list)){
int offset = (pageNumber - 1) * pageSize;
for (int i = 0 , size = list.size(); i < size; i++) {
list.get(i).setTempId(i+1 + offset);
}
}
model.put("pager", page);
///
/*Page<Project> myApproveProjects = projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), 1, Integer.MAX_VALUE);
model.put("hasApproveProjects", CollectionUtil.isNotEmpty(myApproveProjects.getList()) ? "1" : "0");*/
@ -584,6 +594,19 @@ public class ProjectController extends BaseController {
return ResponseMsg.buildSuccessMsg("成功");
}
/**
* 保存项目与用户的关系
*/
@RequestMapping("/checkProjectNo")
@ResponseBody
public ResponseMsg checkProjectNo(@RequestParam String projectNo, @RequestParam int id) {
Project project = projectRepository.findByProjectName(projectNo);
if (project != null && id != project.getId()) {
return ResponseMsg.buildFailedMsg("失败");
}
return ResponseMsg.buildSuccessMsg("成功");
}
/**
* 项目提交审核
*/

25
src/main/java/cn/palmte/work/model/Project.java
View File

@ -23,6 +23,15 @@ public class Project {
@GeneratedValue(strategy = GenerationType.IDENTITY)
@GenericGenerator(name = "persistenceGenerator", strategy = "increment")
private int id;
/**
* 序号
*/
@Transient
private int tempId;
/**
* 项目编号
*/
private String projectNo;
/**
* 项目名称
*/
@ -181,6 +190,22 @@ public class Project {
this.id = id;
}
public int getTempId() {
return tempId;
}
public void setTempId(int tempId) {
this.tempId = tempId;
}
public String getProjectNo() {
return projectNo;
}
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
public String getName() {
return name;
}

3
src/main/java/cn/palmte/work/model/ProjectRepository.java
View File

@ -11,6 +11,9 @@ public interface ProjectRepository extends JpaRepository<Project,Integer> {
@Query(value = "select * from project where name = ?1", nativeQuery = true)
Project findByProjectName(String projectName);
@Query(value = "select * from project where project_no = ?1", nativeQuery = true)
Project findByProjectNo(String projectNo);
@Query(value = "select * from project where dept_id = ?1", nativeQuery = true)
List<Project> findByDeptId(int deptId);

10
src/main/resources/templates/admin/project_approve.ftl
View File

@ -159,6 +159,16 @@
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目编号"></div>
<div class="am-u-sm-6 am-u-md-6">
<#--<textarea style="overflow:auto; background-attachment: fixed;
background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
<input type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.projectNo}">
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目名称"></div>
<div class="am-u-sm-6 am-u-md-6">

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

@ -54,7 +54,15 @@
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
value="" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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>
@ -440,6 +448,7 @@
<script src="${base}/assets/js/project_estimate.js"></script>
<script>
var result = 0;
var projectNoResult = 0;
var rateResult = 0;
var check = 0;
$(function () {
@ -523,6 +532,19 @@
return;
}
if (projectNo.length <= 0) {
window.confirm('项目编号不能为空');
check = 1;
return;
}
checkProjectNo();
if (projectNoResult == 1) {
window.confirm('项目编号已存在');
check = 1;
return;
}
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
@ -653,6 +675,21 @@
});
};
function checkProjectNo () {
var projectNo = $("#projectNo").val();
var id = $("#id").val();
$.ajax({
url: "${base}/project/checkProjectNo",
data: {projectNo: projectNo, id: id},
type: "post",
dataType: "json",
async: false,
success: function (data) {
projectNoResult = data.status;
}
});
};
function checkRate () {
$.ajax({
url: "${base}/sys/config/checkRate",

39
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -62,7 +62,15 @@
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
value="${project.projectNo}" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<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>
@ -447,6 +455,7 @@
<script src="${base}/assets/js/project_estimate.js"></script>
<script>
var check = 0;
var projectNoResult = 0;
var rateResult = 0;
var result = 0;
$(function () {
@ -529,6 +538,19 @@
return;
}
if (projectNo.length <= 0) {
window.confirm('项目编号不能为空');
check = 1;
return;
}
checkProjectNo();
if (projectNoResult == 1) {
window.confirm('项目编号已存在');
check = 1;
return;
}
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
@ -661,6 +683,21 @@
});
};
function checkProjectNo () {
var projectNo = $("#projectNo").val();
var id = $("#id").val();
$.ajax({
url: "${base}/project/checkProjectNo",
data: {projectNo: projectNo, id: id},
type: "post",
dataType: "json",
async: false,
success: function (data) {
projectNoResult = data.status;
}
});
};
function checkRate () {
$.ajax({
url: "${base}/sys/config/checkRate",

19
src/main/resources/templates/admin/project_list.ftl
View File

@ -177,8 +177,12 @@
<thead>
<tr class="am-text-nowrap">
<th class="table-title">序号</th>
<th class="table-title">项目编号</th>
<th class="table-title">项目名称</th>
<th class="table-title">项目类型</th>
<th class="table-title">项目合同金额</th>
<th class="table-title">华智产品金额</th>
<th class="table-title">其他产品金额</th>
<th class="table-title">项目状态</th>
<th class="table-title">审核状态</th>
<th class="table-title">当前审核人</th>
@ -192,9 +196,13 @@
<tbody>
<#list pager.list as list>
<tr>
<td>${list.id!}</td>
<td>${list.tempId!}</td>
<td>${list.projectNo!}</td>
<td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
<td>${list.typeDesc!}</td>
<td>${list.contractAmount!}</td>
<td>${list.huazhiProductAmount!}</td>
<td>${list.ziguangOtherAmount!}</td>
<td>${list.statusDesc!}</td>
<td>${list.approveStatusDesc!}</td>
<td>${list.approveName!}</td>
@ -211,6 +219,13 @@
onclick="location.href='${base}/project/selectRoleUser?projectId=${list.id}'"><span class="am-icon-pencil-square-o"></span>设置项目可见性
</button>
</#if>
<#if adminId==1>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/selectRoleUser?projectId=${list.id}'"><span class="am-icon-pencil-square-o"></span>设置项目可见性
</button>
</#if>
<#--<@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 项目等于概算状态、概算审核为草稿和不通过状态-->
@ -323,7 +338,7 @@
<!-- 分页 -->
<#if (pager.list)?exists && (pager.list?size>0) >
<div class="am-fr">
<#include "../common/common_pager.ftl">
<#include "../common/project_pager.ftl">
</div>
<#else>
<div class="am-kai" align="center">