Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/expense/entity/Expense.java

@@ -10,19 +10,19 @@ public class Expense extends ActEntity<Expense> {
     //项目批次
     private String projectBatch;
     //施工费合同折扣
-    private String constructionCost;
+    private Double constructionCost;
     //设计费合同折扣
-    private String designCost;
+    private Double designCost;
     //设计费典型设计折扣
-    private String designTypeicalCost;
+    private Double designTypeicalCost;
     //监理费合同折扣
-    private String supervisionCost;
+    private Double supervisionCost;
     //监理费典型折扣
-    private String supervisionTypeicalCost;
+    private Double supervisionTypeicalCost;
     //发文中设计费金额（不含税）
-    private String documentDesignCost;
+    private Double documentDesignCost;
     //发文中监理费金额（不含税）
-    private String documentSupervisionCost;
+    private Double documentSupervisionCost;
 
 
     private Double designFeePayable;//设计费应付金额
@@ -68,59 +68,59 @@ public class Expense extends ActEntity<Expense> {
         this.projectBatch = projectBatch;
     }
 
-    public String getConstructionCost() {
+    public Double getConstructionCost() {
         return constructionCost;
     }
 
-    public void setConstructionCost(String constructionCost) {
+    public void setConstructionCost(Double constructionCost) {
         this.constructionCost = constructionCost;
     }
 
-    public String getDesignCost() {
+    public Double getDesignCost() {
         return designCost;
     }
 
-    public void setDesignCost(String designCost) {
+    public void setDesignCost(Double designCost) {
         this.designCost = designCost;
     }
 
-    public String getDesignTypeicalCost() {
+    public Double getDesignTypeicalCost() {
         return designTypeicalCost;
     }
 
-    public void setDesignTypeicalCost(String designTypeicalCost) {
+    public void setDesignTypeicalCost(Double designTypeicalCost) {
         this.designTypeicalCost = designTypeicalCost;
     }
 
-    public String getSupervisionCost() {
+    public Double getSupervisionCost() {
         return supervisionCost;
     }
 
-    public void setSupervisionCost(String supervisionCost) {
+    public void setSupervisionCost(Double supervisionCost) {
         this.supervisionCost = supervisionCost;
     }
 
-    public String getSupervisionTypeicalCost() {
+    public Double getSupervisionTypeicalCost() {
         return supervisionTypeicalCost;
     }
 
-    public void setSupervisionTypeicalCost(String supervisionTypeicalCost) {
+    public void setSupervisionTypeicalCost(Double supervisionTypeicalCost) {
         this.supervisionTypeicalCost = supervisionTypeicalCost;
     }
 
-    public String getDocumentDesignCost() {
+    public Double getDocumentDesignCost() {
         return documentDesignCost;
     }
 
-    public void setDocumentDesignCost(String documentDesignCost) {
+    public void setDocumentDesignCost(Double documentDesignCost) {
         this.documentDesignCost = documentDesignCost;
     }
 
-    public String getDocumentSupervisionCost() {
+    public Double getDocumentSupervisionCost() {
         return documentSupervisionCost;
     }
 
-    public void setDocumentSupervisionCost(String documentSupervisionCost) {
+    public void setDocumentSupervisionCost(Double documentSupervisionCost) {
         this.documentSupervisionCost = documentSupervisionCost;
     }
 }

src/main/java/com/jeeplus/modules/sg/financial/expense/mapper/ExpenseMapper.java

@@ -13,5 +13,9 @@ import java.util.List;
 
 @MyBatisMapper
 public interface ExpenseMapper extends BaseMapper<Expense> {
+    void deleteData(String id);
 
+    void insertData(Expense expense);
+
+    void
 }

src/main/java/com/jeeplus/modules/sg/financial/expense/mapper/xml/ExpenseMapper.xml

@@ -55,8 +55,8 @@
         </choose>
     </select>
 
-    <insert id="insert">
-		INSERT INTO js_expense_entry(
+    <insert id="insertData">
+		insert INTO js_expense_entry(
 			id,
 			create_by,
 			create_date,
@@ -75,14 +75,45 @@
 			documentDesignCost,
 			documentSupervisionCost
 		) VALUES (
-
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{remarks},
+			#{projectName},
+			#{projectId},
+			#{projectBatch},
+			#{constructionCost},
+			#{designCost},
+			#{designTypeicalCost},
+			#{supervisionCost},
+			#{supervisionTypeicalCost},
+			#{documentDesignCost},
+			#{documentSupervisionCost}
 		)
 	</insert>
 
-    <update id="update">
+    <update id="updateData">
 		UPDATE js_expense_entry SET
-
-
+			id = #{id},
+			create_by = #{createBy.id},
+			create_date = #{createDate},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			del_flag = #{delFlag},
+			remarks = #{remarks},
+			projectName = #{projectName},
+			projectId = #{projectId},
+			projectBatch = #{projectBatch},
+			constructionCost = #{constructionCost},
+			designCost = #{designCost},
+			designTypeicalCost = #{designTypeicalCost},
+			supervisionCost = #{supervisionCost},
+			supervisionTypeicalCost = #{supervisionTypeicalCost},
+			documentDesignCost = #{documentDesignCost},
+			documentSupervisionCost = #{documentSupervisionCost}
 		WHERE id = #{id}
 	</update>
 
@@ -99,6 +130,10 @@
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-
+	<!--批量删除-->
+	<update id="deleteData">
+		DELETE FROM js_expense_entry
+		WHERE id = #{id}
+	</update>
 
 </mapper>

src/main/java/com/jeeplus/modules/sg/financial/expense/service/ExpenseService.java

@@ -72,4 +72,9 @@ public class ExpenseService extends CrudService<ExpenseMapper, Expense> {
     public void delete(Expense entity) {
         super.delete(entity);
     }
+
+    @Transactional(readOnly = false)
+    public void deleteData(String id){
+        expenseMapper.deleteData(id);
+    }
 }

src/main/java/com/jeeplus/modules/sg/financial/expense/web/ExpenseController.java

@@ -11,6 +11,7 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.financial.expense.entity.Expense;
 import com.jeeplus.modules.sg.financial.expense.service.ExpenseService;
 import com.jeeplus.modules.test.onetomany.form.entity.TestDataMain2;
@@ -73,6 +74,28 @@ public class ExpenseController extends BaseController {
 		return getBootstrapData(page);
 	}
 
+	//添加数据页面
+	@RequestMapping(value = "addForm")
+	public String addForm(Expense expense, Model model) {
+		model.addAttribute("expense", expense);
+		return "modules/sg/financial/expense/expenseForm";
+	}
+
+	/**
+	 * 批量删除
+	 */
+	@ResponseBody
+	@RequestMapping(value = "deleteAll")
+	public AjaxJson deleteAll(String ids) {
+		AjaxJson j = new AjaxJson();
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			expenseService.deleteData(id);
+		}
+		j.setMsg("删除成功");
+		return j;
+	}
+
 	/*		*	*//**
 	 * 查看，增加，编辑票务代理表单页面
 	 *//*
@@ -82,33 +105,35 @@ public class ExpenseController extends BaseController {
 		model.addAttribute("testDataMain2", testDataMain2);
 		model.addAttribute("mode", mode);
 		return "modules/test/onetomany/form/testDataMain2Form";
-	}
+	}*/
 
-	*//**
+	/**
 	 * 保存票务代理
-	 *//*
+	 */
 	@ResponseBody
-	@RequiresPermissions(value={"test:onetomany:form:testDataMain2:add","test:onetomany:form:testDataMain2:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public AjaxJson save(TestDataMain2 testDataMain2, Model model) throws Exception{
+	public AjaxJson save(Expense expense, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
-		*//**
-		 * 后台hibernate-validation插件校验
-		 *//*
-		String errMsg = beanValidator(testDataMain2);
-		if (StringUtils.isNotBlank(errMsg)){
-			j.setSuccess(false);
-			j.setMsg(errMsg);
-			return j;
-		}
-		//新增或编辑表单保存
-		testDataMain2Service.save(testDataMain2);//保存
+		expenseService.save(expense);//保存
+		j.setSuccess(true);
+		j.setMsg("保存票务代理成功");
+		return j;
+	}
+
+	/**
+	 * 保存票务代理
+	 */
+	@ResponseBody
+	@RequestMapping(value = "update")
+	public AjaxJson update(Expense expense, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		expenseService.(expense);//保存
 		j.setSuccess(true);
 		j.setMsg("保存票务代理成功");
 		return j;
 	}
 	
-	*//**
+	/**
 	 * 删除票务代理
 	 *//*
 	@ResponseBody

src/main/webapp/webpage/modules/sg/financial/expense/expenseForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>数据维护</title>
+	<title>修改数据</title>
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
 
@@ -20,7 +20,7 @@
                 return false;
 			}else{
                 jp.loading();
-                jp.post("${ctx}/sg/settlement/save",$('#inputForm').serialize(),function(data){
+                jp.post("${ctx}/sg/financial/expense/save",$('#inputForm').serialize(),function(data){
                     if(data.success){
                         jp.getParent().refresh();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
@@ -36,9 +36,10 @@
         }
 	</script>
 </head>
+
 <body class="bg-white">
-		<form:form id="inputForm" modelAttribute="maintainData" class="form-horizontal">
-		<form:hidden path="id"/>	
+		<form:form id="inputForm" modelAttribute="expense" class="form-horizontal">
+		<form:hidden path="id"/>
 		<table class="table table-bordered">
 		   <tbody>
 				<tr>
@@ -46,107 +47,51 @@
 					<td class="width-35">
 						<form:input path="projectId" htmlEscape="false"    class="form-control required"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right">设计单位：</label></td>
-					<td class="width-35">
-						<form:input path="designUnits" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right">施工单位：</label></td>
-					<td class="width-35">
-						<form:input path="constructionUnits" htmlEscape="false"    class="form-control "/>
-					</td>
-					<td class="width-15 active"><label class="pull-right">建筑地址：</label></td>
-					<td class="width-35">
-						<form:input path="address" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right">建设性质：</label></td>
-					<td class="width-35">
-						<form:input path="property" htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="pull-right">发文总投资：</label></td>
-					<td class="width-35">
-						<form:input path="investment" htmlEscape="false"    class="form-control number"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right">开工时间：</label></td>
-					<td class="width-35">
-						<div class='input-group form_datetime' id='startDate'>
-							<input type='text'  name="startDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.startDate}" pattern="yyyy-MM-dd"/>"/>
-							<span class="input-group-addon">
-			                        <span class="glyphicon glyphicon-calendar"></span>
-			                    </span>
-						</div>
-					</td>
-					<td class="width-15 active"><label class="pull-right">竣工时间：</label></td>
-					<td class="width-35">
-						<div class='input-group form_datetime' id='endDate'>
-						<input type='text'  name="endDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.endDate}" pattern="yyyy-MM-dd"/>"/>
-						<span class="input-group-addon">
-			                        <span class="glyphicon glyphicon-calendar"></span>
-			                    </span>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right">批准文号：</label></td>
-					<td class="width-35">
-						<form:input path="approvalNumber" htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="pull-right">建筑费：</label></td>
+					<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
 					<td class="width-35">
-						<form:input path="buildingFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="projectName" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right">安装费：</label></td>
+					<td class="width-15 active"><label class="pull-right">项目批次：</label></td>
 					<td class="width-35">
-						<form:input path="installFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="projectBatch" htmlEscape="false"    class="form-control "/>
 					</td>
-					<td class="width-15 active"><label class="pull-right">设备购置费：</label></td>
+					<td class="width-15 active"><label class="pull-right">施工费合同折扣：</label></td>
 					<td class="width-35">
-						<form:input path="equipmentFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="constructionCost" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right">主材费：</label></td>
+					<td class="width-15 active"><label class="pull-right">设计费合同折扣：</label></td>
 					<td class="width-35">
-						<form:input path="materialFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="designCost" htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right">设计费：</label></td>
+					<td class="width-15 active"><label class="pull-right">设计费典型设计折扣：</label></td>
 					<td class="width-35">
-						<form:input path="designFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="designTypeicalCost" htmlEscape="false"    class="form-control number"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right">监理费：</label></td>
+					<td class="width-15 active"><label class="pull-right">监理费合同折扣：</label></td>
 					<td class="width-35">
-						<form:input path="supervisionFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="supervisionCost" htmlEscape="false"    class="form-control number"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right">前期工作费：</label></td>
+					<td class="width-15 active"><label class="pull-right">监理费典型折扣：</label></td>
 					<td class="width-35">
-						<form:input path="preliminaryWorkFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="supervisionTypeicalCost" htmlEscape="false"    class="form-control number"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right">线路施工赔偿费：</label></td>
+					<td class="width-15 active"><label class="pull-right">发文中设计费金额（不含税）：</label></td>
 					<td class="width-35">
-						<form:input path="damages" htmlEscape="false"    class="form-control number"/>
+						<form:input path="documentDesignCost" htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right">法人管理费：</label></td>
+					<td class="width-15 active"><label class="pull-right">发文中监理费金额（不含税）：</label></td>
 					<td class="width-35">
-						<form:input path="managementFee" htmlEscape="false"    class="form-control number"/>
+						<form:input path="documentSupervisionCost" htmlEscape="false"    class="form-control number"/>
 					</td>
 				</tr>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class="pull-right">合计：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="totalFee" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
 		 	</tbody>
 		</table>
 	</form:form>

src/main/webapp/webpage/modules/sg/financial/expense/expenseList.js

@@ -176,7 +176,7 @@ $(document).ready(function() {
   }
   
    function add(){
-	  jp.openSaveDialog('新增', "${ctx}/sg/settlement/form",'800px', '500px');
+	  jp.openSaveDialog('新增', "${ctx}/sg/financial/expense/addForm",'800px', '500px');
   }
 
 
@@ -185,16 +185,23 @@ $(document).ready(function() {
        if(id == undefined){
 	      id = getIdSelections();
 	}
-	jp.openSaveDialog('编辑', "${ctx}/sg/settlement/form?id=" + id, '800px', '500px');
+	jp.openSaveDialog('编辑', "${ctx}/sg/financial/expense/addForm?id=" + id, '800px', '500px');
   }
-  
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看', "${ctx}/sg/settlement/form?id=" + id, '800px', '500px');
- }
 
+    function deleteAll(){
+
+        jp.confirm('确认要删除该数据记录吗？', function(){
+            jp.loading();
+            jp.get("${ctx}/sg/financial/expense/deleteAll?ids=" + getIdSelections(), function(data){
+                if(data.success){
+                    $('#dataTable').bootstrapTable('refresh');
+                    jp.success(data.msg);
+                }else{
+                    jp.error(data.msg);
+                }
+            })
 
+        })
+    }
 
 </script>