erp 账户 新建 修改 删除 查找

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/mapper/xml/ErpCreditChild1Mapper.xml

@@ -98,34 +98,42 @@
 	
 	<update id="update">
 		UPDATE js_erp_credit_child1 SET
-
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			del_flag = #{delFlag},
+			eqm_material_details = #{eqmMaterialDetails1},
+			eqm_unit = #{eqmUnit},
+			eqm_numbers = #{eqmNumbers},
+			eqm_total_capacity = #{eqmTotalCapacity},
+			eqm_booked_fee = #{eqmBookedFee1}
 		WHERE id = #{id}
 	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM test_data_child
+		DELETE FROM js_erp_credit_child1
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main_id = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE test_data_child SET 
+		UPDATE js_erp_credit_child1 SET
 			del_flag = #{DEL_FLAG_DELETE}
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main_id = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/mapper/xml/ErpCreditChild2Mapper.xml

@@ -88,43 +88,40 @@
 	</insert>
 	
 	<update id="update">
-		UPDATE test_data_child2 SET 	
-			startarea = #{startArea.id},
-			endarea = #{endArea.id},
-			starttime = #{startTime},
-			price = #{price},
-			yes_no = #{isHave},
-			test_data_main = #{testDataMain.id},
+		UPDATE js_erp_credit_child2 SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks}
+			remarks = #{remarks},
+			del_flag = #{delFlag},
+			eqm_material_details = #{eqmMaterialDetails2},
+			mtl_booked_fee = #{mtlBookedFee2}
 		WHERE id = #{id}
 	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM test_data_child2
+		DELETE FROM js_erp_credit_child2
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE test_data_child2 SET 
+		UPDATE js_erp_credit_child2 SET
 			del_flag = #{DEL_FLAG_DELETE}
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/mapper/xml/ErpCreditChild3Mapper.xml

@@ -100,42 +100,44 @@
 	</insert>
 	
 	<update id="update">
-		UPDATE test_data_child3 SET 	
-			startarea = #{startArea.id},
-			endarea = #{endArea.id},
-			price = #{price},
-			yes_no = #{isHave},
-			test_data_main = #{testDataMain.id},
+		UPDATE js_erp_credit_child3 SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks}
+			remarks = #{remarks},
+			del_flag = #{delFlag},
+			tenkv_model = #{tenKvModel},
+			tenkv_unit = #{tenKvUnit},
+			tenkv_length = #{tenKvLength},
+			tenkv_line_length = #{tenKvLineLength},
+			tenkv_its_line = #{tenKvItsLine},
+			tenkv_ites_fhv_follow = #{tenKvItesFhvFollow}
 		WHERE id = #{id}
 	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM test_data_child3
+		DELETE FROM js_erp_credit_child3
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE test_data_child3 SET 
+		UPDATE js_erp_credit_child3 SET
 			del_flag = #{DEL_FLAG_DELETE}
 		<choose>
 			<when test="id !=null and id != ''">
 				WHERE id = #{id}
 			</when>
 			<otherwise>
-				WHERE test_data_main = #{testDataMain.id}
+				WHERE erp_credit_id = #{erpCredit.id}
 			</otherwise>
 		</choose>
 	</update>

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/mapper/xml/ErpCreditMapper.xml

@@ -40,6 +40,9 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="itemId != null and itemId != ''">
+				AND a.item_id = #{itemId}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -122,6 +125,21 @@
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
+			del_flag = #{delFlag},
+			item_id = #{itemId},
+			item_name = #{itemName},
+			actual_investment = #{actualInvestment},
+			transfer_assets = #{transferAssets},
+			cons_building_fee = #{consBuildingFee},
+			cons_install_fee = #{consInstallFee},
+			cons_total_fee = #{consInstallFee},
+			other_supervisor_fee = #{otherSupervisorFee},
+			other_design_fee = #{otherDesignFee},
+			other_bework_fee = #{otherBeWorkFee},
+			other_build_loan = #{otherBuildLoan},
+			other_line_damages = #{otherLineDamages},
+			other_legal_manage =#{otherLegalManage},
+			other_total_fee = #{otherTotalFee}
 		WHERE id = #{id}
 	</update>
 

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -58,33 +58,45 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         System.out.println(erpCredit);
         super.save(erpCredit);
         for (ErpCreditChild1 erpCreditChild1 : erpCredit.getErpCreditChild1s()){
-            if (erpCreditChild1.getErpCredit().getItemId().isEmpty()){
-                continue;
-            }
             if (ErpCreditChild1.DEL_FLAG_NORMAL.equals(erpCredit.getDelFlag())){
-                erpCreditChild1.setErpCredit(erpCredit);
-                erpCreditChild1.preInsert();
-                erpCreditChild1Mapper.insert(erpCreditChild1);
+                if (StringUtils.isBlank(erpCreditChild1.getId())) {
+                    erpCreditChild1.setErpCredit(erpCredit);
+                    erpCreditChild1.preInsert();
+                    erpCreditChild1Mapper.insert(erpCreditChild1);
+                }else {
+                    erpCreditChild1.preUpdate();
+                    erpCreditChild1Mapper.update(erpCreditChild1);
+                }
+            }else {
+                erpCreditChild1Mapper.delete(erpCreditChild1);
             }
         }
         for (ErpCreditChild2 erpCreditChild2 : erpCredit.getErpCreditChild2s()){
-            if (erpCreditChild2.getErpCredit().getItemId().isEmpty()){
-                continue;
-            }
             if (ErpCreditChild2.DEL_FLAG_NORMAL.equals(erpCreditChild2.getDelFlag())){
-                erpCreditChild2.setErpCredit(erpCredit);
-                erpCreditChild2.preInsert();
-                erpCreditChild2Mapper.insert(erpCreditChild2);
+                if (StringUtils.isBlank(erpCreditChild2.getId())){
+                    erpCreditChild2.setErpCredit(erpCredit);
+                    erpCreditChild2.preInsert();
+                    erpCreditChild2Mapper.insert(erpCreditChild2);
+                }else {
+                    erpCreditChild2.preUpdate();
+                    erpCreditChild2Mapper.update(erpCreditChild2);
+                }
+            }else {
+                erpCreditChild2Mapper.delete(erpCreditChild2);
             }
         }
         for (ErpCreditChild3 erpCreditChild3 : erpCredit.getErpCreditChild3s()){
-            if (erpCreditChild3.getErpCredit().getItemId().isEmpty()){
-                continue;
-            }
             if (ErpCreditChild3.DEL_FLAG_NORMAL.equals(erpCreditChild3.getDelFlag())){
-                erpCreditChild3.setErpCredit(erpCredit);
-                erpCreditChild3.preInsert();
-                erpCreditChild3Mapper.insert(erpCreditChild3);
+                if (StringUtils.isBlank(erpCreditChild3.getId())){
+                    erpCreditChild3.setErpCredit(erpCredit);
+                    erpCreditChild3.preInsert();
+                    erpCreditChild3Mapper.insert(erpCreditChild3);
+                }else {
+                    erpCreditChild3.preUpdate();
+                    erpCreditChild3Mapper.update(erpCreditChild3);
+                }
+            }else {
+                erpCreditChild3Mapper.delete(erpCreditChild3);
             }
         }
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -219,9 +219,9 @@ public class ErpCreditController extends BaseController {
 	public AjaxJson importFileTemplate(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
 		try {
-			String fileName = "请假表单数据导入模板.xlsx";
+			String fileName = "表单数据导入模板.xlsx";
 			List<ErpCredit> list = Lists.newArrayList();
-			new ExportExcel("请假表单数据", ErpCredit.class, 1).setDataList(list).write(response, fileName).dispose();
+			new ExportExcel("表单数据", ErpCredit.class, 1).setDataList(list).write(response, fileName).dispose();
 			return null;
 		} catch (Exception e) {
 			j.setSuccess(false);