Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DataMaintenanceMapper.java

@@ -14,4 +14,5 @@ import java.util.List;
 @MyBatisMapper
 public interface DataMaintenanceMapper extends BaseMapper<MaintainData> {
 	int insertList(@Param("list") List<MaintainData> list);
+	void deleteData(String projectId);
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.jeeplus.modules.sg.financial.settlement.mapper.DataMaintenanceMapper">
     
 	<sql id="infoColumns">
-		a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -31,7 +30,7 @@
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM js_maintain_data a
-		WHERE a.id = #{id}
+		WHERE a.project_id = #{id}
 	</select>
 	
 	<select id="findList" resultType="MaintainData" >
@@ -78,7 +77,7 @@
 	
 	<insert id="insert">
 		INSERT INTO js_maintain_data(
-			id,
+
 			create_by,
 			create_date,
 			update_by,
@@ -100,7 +99,7 @@
 			management_fee,
 			total_fee
 		) VALUES (
-			#{id},
+
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -126,7 +125,7 @@
 
     <insert id="insertList">
         replace INTO js_maintain_data(
-			id,
+
 			create_by,
 			create_date,
 			update_by,
@@ -150,7 +149,7 @@
 		) VALUES
         <foreach collection="list" item="item" index="index" separator="," >
 		(
-			#{item.id},
+
 			#{item.createBy.id},
 			#{item.createDate},
 			#{item.updateBy.id},
@@ -181,7 +180,7 @@
 			update_date = #{updateDate},
 			remarks = #{remarks},
 			start_date = #{startDate},
-			project_id = #{projectId},
+
 			end_date = #{endDate},
 			approval_number = #{approvalNumber},
 			building_fee = #{buildingFee},
@@ -194,21 +193,26 @@
 			damages = #{damages},
 			management_fee = #{managementFee},
 			total_fee = #{totalFee}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM js_maintain_data
-		WHERE id = #{id}
+		WHERE project_id = #{id}
+	</update>
+
+	<update id="deleteData">
+		DELETE FROM js_maintain_data
+		WHERE project_id = #{projectId}
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE js_maintain_data SET
 			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 	
 	

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DataMaintenanceService.java

@@ -56,6 +56,11 @@ public class DataMaintenanceService extends CrudService<DataMaintenanceMapper, M
 		super.delete(maintainData);
 	}
 
+	@Transactional(readOnly = false)
+	public void deleteData(String projectId){
+		dataMaintenanceMapper.deleteData(projectId);
+	}
+
 
 	public void export(MaintainData maintainData , HttpServletResponse response){
 		Workbook workbook = null;

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -64,7 +64,7 @@ public class DataMaintenanceController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(MaintainData maintainData, Model model) {
 		model.addAttribute("maintainData", maintainData);
-		return "modules/sg/settlement/dataMaintenanceList";
+		return "modules/sg/financial/settlement/dataMaintenanceList";
 	}
 	
 		/**
@@ -76,22 +76,18 @@ public class DataMaintenanceController extends BaseController {
 	public Map<String, Object> data(MaintainData maintainData, HttpServletRequest request, HttpServletResponse response, Model model,HttpSession session) {
 		String id = UserUtils.getUser().getId();
 		String state = maintainData.getState();
-		StringBuilder stringBuilder = new StringBuilder();
+		String st = "";
 		if(state.equals("0")) {
-			String st = (String) session.getAttribute(id);
-			if (StringUtils.isNotBlank(st)) {
-				stringBuilder.append(st);
-			}
+			st = (String) session.getAttribute(id);
 		}else {
 			session.removeAttribute(id);
 		}
 		String projectId = maintainData.getProjectId();
 		if(StringUtils.isNotBlank(projectId)){
-			stringBuilder.append(projectId);
+			st = projectId;
 		}
-		String newstr = stringBuilder.toString();
-		if(StringUtils.isNotBlank(newstr)){
-			String[] sts = newstr.split("\\s+");
+		if(StringUtils.isNotBlank(st)){
+			String[] sts = st.split("\\s+");
 			maintainData.setProjectIds(sts);
 		}
 		Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response), maintainData);
@@ -135,7 +131,7 @@ public class DataMaintenanceController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(MaintainData maintainData, Model model) {
 		model.addAttribute("maintainData", maintainData);
-		return "modules/sg/settlement/dataMaintenanceForm";
+		return "modules/sg/financial/settlement/dataMaintenanceForm";
 	}
 
 	/**
@@ -185,7 +181,7 @@ public class DataMaintenanceController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		String idArray[] =ids.split(",");
 		for(String id : idArray){
-			dataMaintenanceService.delete(dataMaintenanceService.get(id));
+			dataMaintenanceService.deleteData(id);
 		}
 		j.setMsg("删除成功");
 		return j;

src/main/webapp/webpage/modules/sg/settlement/dataMaintenanceList.js

@@ -61,7 +61,7 @@ $(document).ready(function() {
                    } else if($el.data("item") == "delete"){
                         jp.confirm('确认要删除该数据记录吗？', function(){
                        	jp.loading();
-                       	jp.get("${ctx}/sg/settlement/delete?id="+row.id, function(data){
+                       	jp.get("${ctx}/sg/settlement/delete?id="+row.projectId, function(data){
                    	  		if(data.success){
                    	  			$('#dataTable').bootstrapTable('refresh');
                    	  			jp.success(data.msg);
@@ -91,10 +91,10 @@ $(document).ready(function() {
 		        	value = jp.unescapeHTML(value);
 				   <c:choose>
 					   <c:when test="${fns:hasPermission('sg:settlement:edit')}">
-					      return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+					      return "<a href='javascript:edit(\""+row.projectId+"\")'>"+value+"</a>";
 				      </c:when>
 					  <c:when test="${fns:hasPermission('sg:settlement:view')}">
-					      return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+					      return "<a href='javascript:view(\""+row.projectId+"\")'>"+value+"</a>";
 				      </c:when>
 					  <c:otherwise>
 					      return value;
@@ -254,7 +254,7 @@ $(document).ready(function() {
 		
   function getIdSelections() {
         return $.map($("#dataTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
+            return row.projectId
         });
     }