Browse Source

2019 11-19 11:42

xs 5 years ago
parent
commit
4de12e6b1e

+ 2 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -14,5 +14,6 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
  */
 @MyBatisMapper
 public interface ProjectMapper extends BaseMapper<Project> {
-	
+
+    public void updateStatus(String status);
 }

+ 12 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -41,9 +41,15 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="status != null and  status != ''">
+				AND a.status = #{status}
+			</if>
 			<if test="id != null and  id != ''">
 				AND a.id = #{id}
 			</if>
+			<if test="requireName != null and  requireName != ''">
+				AND a.require_name = #{requireName}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -165,5 +171,10 @@
 	<select id="findUniqueByProperty" resultType="Project" statementType="STATEMENT">
 		select * FROM sm_project_detail  where ${id} = '${value}'
 	</select>
-	
+
+	<update id="updateStatus">
+		UPDATE sm_project_detail SET
+			status = #{status}
+		WHERE a.require_name = #{requireName},
+	</update>
 </mapper>

+ 9 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +22,8 @@ import com.jeeplus.core.service.CrudService;
 @Service
 @Transactional(readOnly = true)
 public class ProjectService extends CrudService<ProjectMapper, Project> {
+    @Autowired
+	private ProjectMapper projectMapper;
 
 	public Project get(String id) {
 		return super.get(id);
@@ -43,5 +46,10 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public void delete(Project project) {
 		super.delete(project);
 	}
-	
+
+	@Transactional
+	public void updateStatus(String status){
+	    projectMapper.updateStatus(status);
+    }
+
 }

+ 5 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -38,13 +38,17 @@ public  class ProExcelInfo {
                 project.setWhetherRheUpwind((String)importUtil.getCellValue(row,12));//是否迎风期度夏项目
                 project.setSureDaDate((String)importUtil.getCellValue(row,13));//确定下达时间
                 project.setTextRemark((String)importUtil.getCellValue(row,14));//备注
-                project.setStatus(getStatus());
+                project.setStatus("0");
                 list.add(project);
             }
         }
         return list;
     }
 
+    /**
+     * 生成随机数
+     * @return
+     */
     public static String getStatus(){
         int machineId = 1;
         int hashCodeV = UUID.randomUUID().toString().hashCode();

+ 8 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -75,6 +75,14 @@ public class ProjectController extends BaseController {
 		return getBootstrapData(page);
 	}
 
+	@ResponseBody
+//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequestMapping(value = "dataSys")
+	public Map<String, Object> dataSys(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
+		project.setStatus("0");
+		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
+		return getBootstrapData(page);
+	}
 	/**
 	 * 查看,增加,编辑表单表单页面
 	 */

+ 2 - 2
src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -153,8 +153,8 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
-									<sys:itemselect url="${ctx}/sg/financial/project/data" id="list" name="project.id" value="${project.id}" labelName="project.requireName" labelValue="${project.requireName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="123|456" fieldKeys="id|requireName" searchLabels="1234|4567" searchKeys="id|requireName" ></sys:itemselect>
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="project.id" value="${project.id}" labelName="project.requireName" labelValue="${project.requireName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="需求编号|项目需求名称|需求提出单位" fieldKeys="id|requireName|demandUnit" searchLabels="需求编号|项目需求名称" searchKeys="id|requireName" ></sys:itemselect>
 								</td>
 							</tr>
 							<tr>