Browse Source

handled null value for strett name for both public and department

master
AJITHKUMAR12 2 months ago
parent
commit
14a1a06f0a
  1. 6
      src/main/java/com/gcc/greencommitte/controller/Apicontroller.java
  2. 10
      src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java
  3. 2
      src/main/resources/application.properties
  4. 4
      src/main/resources/templates/modules/department/form.html
  5. 2
      src/main/resources/templates/modules/public/form.html

6
src/main/java/com/gcc/greencommitte/controller/Apicontroller.java

@ -196,7 +196,7 @@ public class Apicontroller {
@RequestParam MultipartFile c1image, @RequestParam MultipartFile c1image,
@RequestParam MultipartFile c2image, @RequestParam MultipartFile c2image,
@RequestParam String comp_details, @RequestParam String comp_details,
@RequestParam String streetName,
@RequestParam(required = false) String streetName,
@RequestParam String source) throws JsonMappingException, JsonProcessingException { @RequestParam String source) throws JsonMappingException, JsonProcessingException {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
@ -490,7 +490,7 @@ public class Apicontroller {
@RequestParam MultipartFile c1image, @RequestParam MultipartFile c1image,
@RequestParam MultipartFile c2image, @RequestParam MultipartFile c2image,
@RequestParam String comp_details, @RequestParam String comp_details,
@RequestParam String streetName,
@RequestParam(required = false) String streetName,
@RequestParam String source) throws JsonMappingException, JsonProcessingException { @RequestParam String source) throws JsonMappingException, JsonProcessingException {
@ -508,7 +508,7 @@ public class Apicontroller {
c1imagePath = gcservice.fileUpload(c1image, "comp_image1"); c1imagePath = gcservice.fileUpload(c1image, "comp_image1");
c2imagePath = gcservice.fileUpload(c2image, "comp_image1"); c2imagePath = gcservice.fileUpload(c2image, "comp_image1");
// System.out.println("======="+latitude+","+longitude);
// System.out.println("address=======" + address);
String saveStatus = gcservice.savedeptform(dept_id, dept_name, ph_no, designation, govt_type, address, latitude, String saveStatus = gcservice.savedeptform(dept_id, dept_name, ph_no, designation, govt_type, address, latitude,
longitude, zone, ward, remarks, c1imagePath, c2imagePath, compList, totalTreeCount, streetName, source); longitude, zone, ward, remarks, c1imagePath, c2imagePath, compList, totalTreeCount, streetName, source);

10
src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java

@ -141,6 +141,7 @@ public class Greencommitteeservice {
String cby = "public"; String cby = "public";
String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null; String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null;
String streetNameval = (streetName != null && !streetName.isEmpty()) ? streetName : null;
String sql = "INSERT INTO reg_details (" String sql = "INSERT INTO reg_details ("
+ "cby,p_name,ph_no,gender,address,zone,ward,total_trees,remarks,latitude,longitude,source,street_name " + "cby,p_name,ph_no,gender,address,zone,ward,total_trees,remarks,latitude,longitude,source,street_name "
@ -163,7 +164,7 @@ public class Greencommitteeservice {
ps.setString(10, latitude); ps.setString(10, latitude);
ps.setString(11, longitude); ps.setString(11, longitude);
ps.setString(12, source); ps.setString(12, source);
ps.setString(13, streetName);
ps.setString(13, streetNameval);
return ps; return ps;
}, keyHolder); }, keyHolder);
// return keyHolder.getKey().intValue(); // return keyHolder.getKey().intValue();
@ -209,10 +210,11 @@ public class Greencommitteeservice {
String cby = "department"; String cby = "department";
int deptIdInt = Integer.parseInt(dept_id); int deptIdInt = Integer.parseInt(dept_id);
System.out.println("address = " + address);
System.out.println("streetName = " + streetName);
// System.out.println("address = " + address);
// System.out.println("streetName = " + streetName);
String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null; String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null;
String streetNameval = (streetName != null && !streetName.isEmpty()) ? streetName : null;
String sql = "INSERT INTO reg_details (" String sql = "INSERT INTO reg_details ("
+ "cby,dept_id,dept_name,govt_type,designation,ph_no,address,zone,ward,total_trees,remarks,latitude,longitude,street_name,source " + "cby,dept_id,dept_name,govt_type,designation,ph_no,address,zone,ward,total_trees,remarks,latitude,longitude,street_name,source "
@ -236,7 +238,7 @@ public class Greencommitteeservice {
ps.setString(11, remarksVal); ps.setString(11, remarksVal);
ps.setString(12, latitude); ps.setString(12, latitude);
ps.setString(13, longitude); ps.setString(13, longitude);
ps.setString(14, streetName);
ps.setString(14, streetNameval);
ps.setString(15, source); ps.setString(15, source);
return ps; return ps;

2
src/main/resources/application.properties

@ -1,3 +1,3 @@
spring.application.name=greencommitte spring.application.name=greencommitte
spring.profiles.active=dev
spring.profiles.active=prod

4
src/main/resources/templates/modules/department/form.html

@ -1309,7 +1309,9 @@
} }
formData.set("streetName", streetName); formData.set("streetName", streetName);
let address = $("#address").val().trim(); let address = $("#address").val().trim();
formData.append("address", address)
//formData.append("address", address);
console.log("address");
console.log(address);
formData.append("ph_no", mobnumber); formData.append("ph_no", mobnumber);
//formData.append("designation",designation); //formData.append("designation",designation);

2
src/main/resources/templates/modules/public/form.html

@ -1303,7 +1303,7 @@
//formData.append("address", streetName) //formData.append("address", streetName)
formData.set("streetName", streetName); formData.set("streetName", streetName);
let address = $("#address").val().trim(); let address = $("#address").val().trim();
formData.append("address", address)
// formData.append("address", address)
formData.append("c1image", c1image); formData.append("c1image", c1image);

Loading…
Cancel
Save