Antiloveg лет назад: 8
Родитель
Сommit
fa8b2e5184

+ 4 - 0
schema/data/permission.sql

@@ -501,3 +501,7 @@ values
 (UUID(), 'api/admin/portal/order/demandOrderLog', '科技需求管理--科技需求线索单/意向单log'),
 (UUID(), 'api/admin/portal/order/demandOrderLog', '科技需求管理--科技需求线索单/意向单log'),
 (UUID(), 'api/admin/portal/order/updateDemandOrder', '科技需求管理--科技需求线索单/意向单修改'),
 (UUID(), 'api/admin/portal/order/updateDemandOrder', '科技需求管理--科技需求线索单/意向单修改'),
 (UUID(), 'api/admin/portal/order/downloadDemandOrder', '科技需求管理--下载科技需求线索单/意向单文件');
 (UUID(), 'api/admin/portal/order/downloadDemandOrder', '科技需求管理--下载科技需求线索单/意向单文件');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/deleteHumanResource', '企业人员情况--删除团体人力资源');

+ 24 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -750,7 +750,24 @@ public class AdminApiController extends CertifyApiController {
 		}
 		}
 		return res;
 		return res;
 	}
 	}
-
+	
+	/**
+	 * 删除团体人力资源
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteHumanResource", method = RequestMethod.POST)
+	public Result deleteHumanResource(@RequestParam(name = "ids[]", required = false) String[] ids) {
+		Result res = new Result();
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			orgHumanResourceService.batchDeleteByPrimaryKey(Arrays.asList(ids));
+		}
+		return res;
+	}
+	
+	
 	/**
 	/**
 	 * 企业参与国家标准或行业标准制定情况明细列表
 	 * 企业参与国家标准或行业标准制定情况明细列表
 	 */
 	 */
@@ -1154,6 +1171,12 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgTechProduct, otp);
 		BeanUtils.copyProperties(orgTechProduct, otp);
 
 
 		if (StringUtils.isBlank(otp.getId())) {
 		if (StringUtils.isBlank(otp.getId())) {
+			OrgTechProduct product = orgTechProductService.findBySerialNumberAndUid(otp.getSerialNumber(),
+					otp.getUid());
+			if (null != product){
+				res.getError().add(buildError("", "产品编号重复,无法保存!"));
+				return res;
+			}
 			otp.setId(UUID.randomUUID().toString());
 			otp.setId(UUID.randomUUID().toString());
 			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			Calendar now = Calendar.getInstance();

+ 8 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1710,7 +1710,8 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 			return res;
 		}
 		}
 
 
-		if (!checkUserLogin(res)) {
+		if (StringUtils.isBlank(orgTechProduct.getSerialNumber())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到产品编号", "产品编号"));
 			return res;
 			return res;
 		}
 		}
 
 
@@ -1723,6 +1724,12 @@ public class CognizanceApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgTechProduct, otp);
 		BeanUtils.copyProperties(orgTechProduct, otp);
 
 
 		if (StringUtils.isBlank(otp.getId())) {
 		if (StringUtils.isBlank(otp.getId())) {
+			OrgTechProduct product = orgTechProductService.findBySerialNumberAndUid(otp.getSerialNumber(),
+					TokenManager.getUserId());
+			if (null != product){
+				res.getError().add(buildError("", "产品编号重复,无法保存!"));
+				return res;
+			}
 			otp.setId(UUID.randomUUID().toString());
 			otp.setId(UUID.randomUUID().toString());
 			otp.setUid(TokenManager.getUserId());
 			otp.setUid(TokenManager.getUserId());
 			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgTechProductService.java

@@ -17,4 +17,6 @@ public interface OrgTechProductService {
 
 
 	OrgTechProduct selectByPrimaryKey(String id);
 	OrgTechProduct selectByPrimaryKey(String id);
 
 
+	OrgTechProduct findBySerialNumberAndUid(String serialNumber, String userId);
+
 }
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgTechProductServiceImpl.java

@@ -61,4 +61,9 @@ public class OrgTechProductServiceImpl extends BaseMybatisDao<OrgTechProductMapp
 	public OrgTechProduct selectByPrimaryKey(String id) {
 	public OrgTechProduct selectByPrimaryKey(String id) {
 		return orgTechProductMapper.selectByPrimaryKey(id);
 		return orgTechProductMapper.selectByPrimaryKey(id);
 	}
 	}
+
+	@Override
+	public OrgTechProduct findBySerialNumberAndUid(String serialNumber, String uid) {
+		return orgTechProductMapper.findBySerialNumberAndUid(serialNumber, uid);
+	}
 }
 }

+ 10 - 6
src/main/java/com/goafanti/common/dao/OrgTechProductMapper.java

@@ -2,20 +2,24 @@ package com.goafanti.common.dao;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.OrgTechProduct;
 import com.goafanti.common.model.OrgTechProduct;
 
 
 public interface OrgTechProductMapper {
 public interface OrgTechProductMapper {
-    int deleteByPrimaryKey(String id);
+	int deleteByPrimaryKey(String id);
 
 
-    int insert(OrgTechProduct record);
+	int insert(OrgTechProduct record);
 
 
-    int insertSelective(OrgTechProduct record);
+	int insertSelective(OrgTechProduct record);
 
 
-    OrgTechProduct selectByPrimaryKey(String id);
+	OrgTechProduct selectByPrimaryKey(String id);
 
 
-    int updateByPrimaryKeySelective(OrgTechProduct record);
+	int updateByPrimaryKeySelective(OrgTechProduct record);
 
 
-    int updateByPrimaryKey(OrgTechProduct record);
+	int updateByPrimaryKey(OrgTechProduct record);
 
 
 	int batchDeleteByPrimaryKey(List<String> id);
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	OrgTechProduct findBySerialNumberAndUid(@Param("serialNumber") String serialNumber, @Param("uid") String uid);
 }
 }

+ 4 - 1
src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml

@@ -507,6 +507,9 @@
 		select
 		select
 		<include refid="Base_Column_List" />
 		<include refid="Base_Column_List" />
 		from org_human_resource
 		from org_human_resource
-		where year = #{0} and uid = #{1}
+		where 
+			year = #{0} 
+		and uid = #{1} 
+		and deleted_sign = 0
 	</select>
 	</select>
 </mapper>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/OrgTechProductMapper.xml

@@ -280,4 +280,13 @@
 		#{item}
 		#{item}
 	</foreach>
 	</foreach>
   </update>
   </update>
+  
+   <select id="findBySerialNumberAndUid" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_tech_product
+    where deleted_sign = 0  
+    and serial_number  = #{serialNumber,jdbcType=VARCHAR}
+    and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>
 </mapper>

+ 11 - 9
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -438,17 +438,19 @@
   </select>
   </select>
   
   
   <select id="selectProjectDetail" resultType="com.goafanti.techproject.bo.TechProjectDetailBo" parameterType="java.lang.String">
   <select id="selectProjectDetail" resultType="com.goafanti.techproject.bo.TechProjectDetailBo" parameterType="java.lang.String">
-  		 select 
-  		 p.id, p.uid, i.licence_province as province, i.licence_city as city, i.licence_area as area, i.postal_address as postalAddress,
-	        i.unit_name as unitName,  i.org_code as orgCode,
-		    p.serial_number as serialNumber,  
-		     a.name as consultant, p.contacts, p.project_des as projectDes, p.subsidy, p.dispatch_info as dispatchInfo,
-        p.project_mode as projectMode, p.project_approval as projectApproval, p.approval_url as approvalUrl , p.department,
-		    p.project_name as projectName, p.project_catagory as projectCatagory, p.tech_field as techField, p.state       
-	  FROM  tech_project p
+  	select 
+  		 p.id, p.uid, i.licence_province as province, 
+  		 i.licence_city as city, i.licence_area as area, i.postal_address as postalAddress,
+	     i.unit_name as unitName,  i.org_code as orgCode, p.serial_number as serialNumber,  
+		 a.name as consultant, p.contacts, p.project_des as projectDes, 
+		 p.subsidy, p.dispatch_info as dispatchInfo, p.project_mode as projectMode, 
+		 p.project_approval as projectApproval, p.approval_url as approvalUrl , p.department,
+		 p.project_name as projectName, p.project_catagory as projectCatagory, p.tech_field as techField, 
+		 p.state       
+	FROM  tech_project p
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN admin a on p.consultant = a.id 
 		LEFT JOIN admin a on p.consultant = a.id 
-		where p.deleted_sign = 0  and p.id = #{uid,jdbcType=VARCHAR}
+	where p.deleted_sign = 0  and p.id = #{uid,jdbcType=VARCHAR}
   </select>
   </select>
   
   
    <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
    <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">

+ 11 - 14
src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java

@@ -1,22 +1,22 @@
 package com.goafanti.techproject.bo;
 package com.goafanti.techproject.bo;
 
 
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProject;
+
 /**
 /**
  * 科技项目详情
  * 科技项目详情
  */
  */
 public class TechProjectDetailBo extends TechProject {
 public class TechProjectDetailBo extends TechProject {
-	private String unitName;
-	
-	private String orgCode;
-	
-	private Integer province;
-	
-	private Integer city;
-	
-	private Integer area;
-	
-	private String postalAddress;
+	private String	unitName;
+
+	private String	orgCode;
+
+	private Integer	province;
 
 
+	private Integer	city;
+
+	private Integer	area;
+
+	private String	postalAddress;
 
 
 	public String getUnitName() {
 	public String getUnitName() {
 		return unitName;
 		return unitName;
@@ -66,7 +66,4 @@ public class TechProjectDetailBo extends TechProject {
 		this.postalAddress = postalAddress;
 		this.postalAddress = postalAddress;
 	}
 	}
 
 
-	
-	
-
 }
 }

+ 1 - 1
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -179,7 +179,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			pageNo = 1;
 			pageNo = 1;
 		}
 		}
 
 
-		if (pageSize == null || pageSize < 0) {
+		if (pageSize == null || pageSize < 0 || pageSize > 10) {
 			pageSize = 10;
 			pageSize = 10;
 		}
 		}
 		return (Pagination<TechProjectManageListBo>) findPage("findTechProjectManageListByPage",
 		return (Pagination<TechProjectManageListBo>) findPage("findTechProjectManageListByPage",

+ 1 - 0
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -693,6 +693,7 @@ public class UserApiController extends BaseApiController {
 	 * 
 	 * 
 	 * @return
 	 * @return
 	 */
 	 */
+	@RequestMapping(value = "/deleteHumanResource", method = RequestMethod.POST)
 	public Result deleteHumanResource(@RequestParam(name = "ids[]", required = false) String[] ids) {
 	public Result deleteHumanResource(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
 		Result res = new Result();
 		if (ids == null || ids.length < 1) {
 		if (ids == null || ids.length < 1) {