Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -41,4 +41,6 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     List<WorkStaffBasicInfo> findListByUserId(WorkStaffBasicInfo workStaffBasicInfo);
 
     void updateStatus(@Param("id") String id, @Param("status") String status);
+
+    int deleteByLogic(WorkStaffBasicInfo workStaffBasicInfo);
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -19,6 +19,7 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.AreaDao;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
@@ -424,7 +425,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 
     @Transactional(readOnly = false)
 	public void delete(WorkStaffBasicInfo workStaffBasicInfo) {
-		super.delete(workStaffBasicInfo);
+//		super.delete(workStaffBasicInfo);
+        workStaffBasicInfoDao.deleteByLogic(workStaffBasicInfo);
 	}
 
 

src/main/resources/jeeplus.properties

@@ -2,48 +2,13 @@
 #===== Database sttings =====#
 #============================#
 
-#oracle database settings
-#jdbc.type=oracle
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
-#jdbc.username=root
-#jdbc.password=root
-
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-#jdbc.url=jdbc:mysql://192.168.1.80:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
-#jdbc.username=root
-#jdbc.password=gangwan
-#jdbc.url=jdbc:mysql://106.14.207.143:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
-#jdbc.username=root
-#jdbc.password=xyc@2017
-#jdbc.url=jdbc:mysql://192.168.110.68:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/ruihuaoa-activity-testenv?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://192.168.110.61:3306/ruihuaoa-activity-data?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://localhost:3306/dkwy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://172.16.182.240:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.username=yangfan
 jdbc.username=root
-#jdbc.username=root
-#jdbc.password=123456
-#jdbc.password=gangwan123
 jdbc.password=root
-#jdbc.url=jdbc:mysql://120.26.207.193:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
-#jdbc.username=root
-#jdbc.password=GANGWAN123
-
-#mssql database settings
-#jdbc.type=mssql
-#jdbc.driver=net.sourceforge.jtds.jdbc.Driver
-#jdbc.url=jdbc:jtds:sqlserver://localhost:1433/jeeplus
-#jdbc.username=sa
-#jdbc.password=sa
 
 #pool settings
 jdbc.pool.init=20
@@ -54,25 +19,23 @@ jdbc.pool.maxActive=200
 jdbc.testSql=SELECT 'x' FROM DUAL
 
 #master
-#master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-master.jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#master.jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 master.jdbc.username=root
 master.jdbc.password=root
 
 #slave
-#slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
-slave.jdbc.url=jdbc:mysql://localhost:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
+slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
+#slave.jdbc.url=jdbc:mysql://localhost:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 slave.jdbc.username=root
 slave.jdbc.password=root
 
 #redis settings
 redis.keyPrefix=jeeplus
-#redis.host=172.16.182.241
-#redis.host=101.37.149.85
-redis.host=192.168.2.4
-#redis.host=127.0.0.1
-redis.port=6380
-#redis.port=6379
+#redis.host=192.168.2.4
+redis.host=127.0.0.1
+#redis.port=6380
+redis.port=6379
 
 #============================#
 #===== System settings ======#

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -5,6 +5,7 @@
     <title>项目管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/static/iCheck/icheck.min.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -66,6 +67,15 @@
             });
             $('#scaleUnit').val("${projectRecords.scaleUnit}")
 
+            $("input[name='ext']").on('ifChecked',function(event){
+                var  radioVal = $(this).val();
+                if(radioVal == 0){
+                    $("#divv").show();
+                }else{
+                    $("#divv").hide();
+                }
+            });
+
         });
 
         function setContractValue(obj){
@@ -211,37 +221,45 @@
 
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目合同信息</h2></div>
-                <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
-                    <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">合同名称：</label>
-                    <div class="layui-input-block">
-                        <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">合同金额(元)：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${projectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程分类：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
-                    </div>
+                <div class="layui-input-block">
+                    <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
+                    <label for="ext">有合同</label>
+                    <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
+                    <label for="ext1">无合同</label>
                 </div>
+               <div id="divv">
+                   <div class="layui-item layui-col-sm12 lw7" id="d1">
+                       <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
+                       <div class="layui-input-block  with-icon">
+                           <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
+                                                   labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                       </div>
+                   </div>
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label">合同名称：</label>
+                       <div class="layui-input-block">
+                           <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+                       </div>
+                   </div>
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label double-line">合同金额(元)：</label>
+                       <div class="layui-input-block">
+                           <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${projectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
+                       </div>
+                   </div>
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label">主委托方：</label>
+                       <div class="layui-input-block">
+                           <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+                       </div>
+                   </div>
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label">工程分类：</label>
+                       <div class="layui-input-block">
+                           <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                       </div>
+                   </div>
+               </div>
             </div>
 
             <div class="form-group layui-row">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -225,8 +225,8 @@
                         if(d.canedit != undefined && d.canedit == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 
-                        <%--if(d.candelete != undefined && d.candelete == "1")--%>
-                        <%--    xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";--%>
+                        if(d.candelete != undefined && d.candelete == "1")
+                            xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
                         return xml;
                     }}
             ]]